Do UI cleanup on heartbeat and connector resource requests (#9770)

Change-Id: I8da2639aaf90d395f825806a7464a9b5732cb87c

2 files changed, 2 insertions, 13 deletions

diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 43d94a420f..b0cc92b85e 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -386,7 +386,6 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
                         (ResourceResponse) response);
             } else {
                 VaadinPortletSession vaadinSession = null;
-                boolean sessionProcessed = false;
 
                 try {
                     // TODO What about PARAM_UNLOADBURST &
@@ -415,8 +414,6 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
                     vaadinSession.getBrowser().updateRequestDetails(
                             vaadinRequest);
 
-                    sessionProcessed = true;
-
                     /* Notify listeners */
 
                     // Finds the right UI
@@ -479,12 +476,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
                     handleServiceException(vaadinRequest, vaadinResponse,
                             vaadinSession, e);
                 } finally {
-
-                    if (sessionProcessed) {
-                        vaadinSession.cleanupInactiveUIs();
-                    }
-
                     if (vaadinSession != null) {
+                        vaadinSession.cleanupInactiveUIs();
                         requestTimer.stop(vaadinSession);
                     }
                 }
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index d289cd6f07..7f664be6fb 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -233,7 +233,6 @@ public class VaadinServlet extends HttpServlet implements Constants {
         }
 
         VaadinServletSession vaadinSession = null;
-        boolean sessionProcessed = false;
 
         try {
             // If a duplicate "close application" URL is received for an
@@ -276,8 +275,6 @@ public class VaadinServlet extends HttpServlet implements Constants {
             /* Update browser information from the request */
             vaadinSession.getBrowser().updateRequestDetails(request);
 
-            sessionProcessed = true;
-
             /* Handle the request */
             if (requestType == RequestType.FILE_UPLOAD) {
                 // UI is resolved in communication manager
@@ -315,8 +312,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
         } catch (final Throwable e) {
             handleServiceException(request, response, vaadinSession, e);
         } finally {
-
-            if (sessionProcessed) {
+            if (vaadinSession != null) {
                 vaadinSession.cleanupInactiveUIs();
             }