Clean the connector map after pushing (#11624)

Removing UidlRequestHandler.postHandleRequest should not affect
backwards compatibility as UidlRequestHandler is a new class.

Change-Id: I7f3753b1c3d37afcc973d3e5571c0d1708177bf9

2 files changed, 1 insertions, 14 deletions

diff --git a/server/src/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
index 14303daebc..dba247258a 100644
--- a/server/src/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
@@ -111,7 +111,6 @@ public class UidlRequestHandler extends SynchronizedRequestHandler {
 
             writeUidl(request, response, uI, stringWriter, repaintAll,
                     analyzeLayouts);
-            postHandleRequest(uI);
         } catch (JSONException e) {
             getLogger().log(Level.SEVERE, "Error writing JSON to response", e);
             // Refresh on client side
@@ -178,19 +177,6 @@ public class UidlRequestHandler extends SynchronizedRequestHandler {
         closeJsonMessage(writer);
     }
 
-    /**
-     * Method called after the paint phase while still being synchronized on the
-     * session
-     * 
-     * @param uI
-     * 
-     */
-    protected void postHandleRequest(UI uI) {
-        // Remove connectors that have been detached from the session during
-        // handling of the request
-        uI.getConnectorTracker().cleanConnectorMap();
-    }
-
     protected void closeJsonMessage(Writer outWriter) throws IOException {
         outWriter.write("}]");
     }
diff --git a/server/src/com/vaadin/server/communication/UidlWriter.java b/server/src/com/vaadin/server/communication/UidlWriter.java
index 79ae8af07e..fbe2fb86d5 100644
--- a/server/src/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/com/vaadin/server/communication/UidlWriter.java
@@ -295,6 +295,7 @@ public class UidlWriter implements Serializable {
             writePerformanceData(ui, writer);
         } finally {
             uiConnectorTracker.setWritingResponse(false);
+            uiConnectorTracker.cleanConnectorMap();
         }
     }