Merge "Reuse provided session instead of attempting to find it again (#9888)"

1 files changed, 3 insertions, 4 deletions

diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index cb41f9338b..293fd002e5 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -2430,7 +2430,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
 
             response.setContentType("application/json; charset=UTF-8");
 
-            UI uI = getBrowserDetailsUI(request);
+            UI uI = getBrowserDetailsUI(request, session);
 
             JSONObject params = new JSONObject();
             params.put(UIConstants.UI_ID_PARAMETER, uI.getUIId());
@@ -2456,10 +2456,9 @@ public abstract class AbstractCommunicationManager implements Serializable {
         }
     }
 
-    private UI getBrowserDetailsUI(VaadinRequest request) {
+    private UI getBrowserDetailsUI(VaadinRequest request,
+            VaadinServiceSession session) {
         VaadinService vaadinService = request.getService();
-        VaadinServiceSession session = VaadinServiceSession.getForSession(
-                vaadinService, request.getWrappedSession());
 
         List<UIProvider> uiProviders = session.getUIProviders();