diff options
author | Aleksi Hietanen <aleksi@vaadin.com> | 2017-01-11 16:12:56 +0200 |
---|---|---|
committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-01-11 16:12:55 +0200 |
commit | 62c0d733b77fc9ad8ab3a6f5f6bb632a5afdc299 (patch) | |
tree | a54c9144cebe1830421ae9addb4448d399b37bbf /client | |
parent | 6431d2e97ab8b4b7c2807d03aa16f6e70188c739 (diff) | |
download | vaadin-framework-62c0d733b77fc9ad8ab3a6f5f6bb632a5afdc299.tar.gz vaadin-framework-62c0d733b77fc9ad8ab3a6f5f6bb632a5afdc299.zip |
Remove tracking of unregistered connectors (#8153)
* Remove tracking of unregistered connectors
* Merge branch '7.7' into 8111-remove-unregistered-connector-tracking
* Merge branch '7.7' into 8111-remove-unregistered-connector-tracking
* Add tests that verify markAsDirty is called on old parent
* Merge branch '7.7' into 8111-remove-unregistered-connector-tracking
Diffstat (limited to 'client')
-rw-r--r-- | client/src/main/java/com/vaadin/client/communication/MessageHandler.java | 22 | ||||
-rw-r--r-- | client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java | 10 |
2 files changed, 8 insertions, 24 deletions
diff --git a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java index 714af23683..38b9a783e5 100644 --- a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java +++ b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java @@ -492,13 +492,9 @@ public class MessageHandler { .handleServerResponse(json.getValueMap("dd")); } - int removed = unregisterRemovedConnectors( + unregisterRemovedConnectors( connectorHierarchyUpdateResult.detachedConnectorIds); - if (removed > 0 && !isResponse(json)) { - // Must acknowledge the removal using an XHR or server - // memory usage will keep growing - getUIConnector().sendAck(); - } + getLogger().info("handleUIDLMessage: " + (Duration.currentTimeMillis() - processUidlStart) + " ms"); @@ -808,15 +804,14 @@ public class MessageHandler { "verifyConnectorHierarchy - this is only performed in debug mode"); } - private int unregisterRemovedConnectors( + private void unregisterRemovedConnectors( FastStringSet detachedConnectors) { Profiler.enter("unregisterRemovedConnectors"); JsArrayString detachedArray = detachedConnectors.dump(); - int nrDetached = detachedArray.length(); - for (int i = 0; i < nrDetached; i++) { - ServerConnector connector = getConnectorMap() - .getConnector(detachedArray.get(i)); + for (int i = 0; i < detachedArray.length(); i++) { + ServerConnector connector = getConnectorMap().getConnector( + detachedArray.get(i)); Profiler.enter( "unregisterRemovedConnectors unregisterConnector"); @@ -831,10 +826,9 @@ public class MessageHandler { verifyConnectorHierarchy(); } - getLogger() - .info("* Unregistered " + nrDetached + " connectors"); + getLogger().info("* Unregistered " + detachedArray.length() + + " connectors"); Profiler.leave("unregisterRemovedConnectors"); - return nrDetached; } private JsArrayString createConnectorsIfNeeded(ValueMap json) { diff --git a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java index c31fcb9ed6..aad3f4bcb6 100644 --- a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java @@ -1133,14 +1133,4 @@ public class UIConnector extends AbstractSingleComponentContainerConnector private static Logger getLogger() { return Logger.getLogger(UIConnector.class.getName()); } - - /** - * Send an acknowledgement RPC to the server. This allows the server to know - * which messages the client has received, even when the client is not - * sending any other traffic. - */ - public void sendAck() { - getRpcProxy(UIServerRpc.class).acknowledge(); - - } } |