aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/test/java/com/vaadin
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2020-08-05 13:00:28 +0300
committerGitHub <noreply@github.com>2020-08-05 13:00:28 +0300
commitb36dc81569fffc9d12fd6648366c965bbae4000e (patch)
tree57391f6040dd7f53f9a76b5c50be917bc7a8901c /server/src/test/java/com/vaadin
parent446a7680c2903d03a90e7eb869ea67ef9a23c51f (diff)
downloadvaadin-framework-b36dc81569fffc9d12fd6648366c965bbae4000e.tar.gz
vaadin-framework-b36dc81569fffc9d12fd6648366c965bbae4000e.zip
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
Diffstat (limited to 'server/src/test/java/com/vaadin')
-rw-r--r--server/src/test/java/com/vaadin/server/communication/ServletUIInitHandlerTest.java1
1 files changed, 1 insertions, 0 deletions
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