From b36dc81569fffc9d12fd6648366c965bbae4000e Mon Sep 17 00:00:00 2001
From: Tatu Lund <tatu@vaadin.com>
Date: Wed, 5 Aug 2020 13:00:28 +0300
Subject: Fix possible NPE with MPR (#12040)

It is possible when Vaadin 8 is used with MPR, that ui.getCurrent().getSession() returns null.

See: https://github.com/vaadin/multiplatform-runtime/issues/5
---
 .../java/com/vaadin/server/communication/ServletUIInitHandlerTest.java   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/src/test/java')

diff --git a/server/src/test/java/com/vaadin/server/communication/ServletUIInitHandlerTest.java b/server/src/test/java/com/vaadin/server/communication/ServletUIInitHandlerTest.java
index 66f3dca4c5..9d68aca898 100644
--- a/server/src/test/java/com/vaadin/server/communication/ServletUIInitHandlerTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/ServletUIInitHandlerTest.java
@@ -54,6 +54,7 @@ public class ServletUIInitHandlerTest {
                     session);
             session.setCommunicationManager(communicationManager);
             session.setConfiguration(deploymentConfiguration);
+            session.setCurrent(session);
             session.addUIProvider(new UIProvider() {
 
                 @Override
-- 
cgit v1.2.3