diff options
author | Tatu Lund <tatu@vaadin.com> | 2020-11-27 16:36:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 16:36:59 +0200 |
commit | 46ecb27caf6068c85af39279fd47889f3bdd1a85 (patch) | |
tree | 24155107e7c5107d2db90369ab84f1b778c12fd8 | |
parent | 6f2c1c7a19a4bf400fc5b8e893e432b2381c41eb (diff) | |
download | vaadin-framework-46ecb27caf6068c85af39279fd47889f3bdd1a85.tar.gz vaadin-framework-46ecb27caf6068c85af39279fd47889f3bdd1a85.zip |
Make checkAtmosphereSupport() non-static (#12136)
Cherry pick https://github.com/vaadin/framework/pull/12131
-rw-r--r-- | server/src/main/java/com/vaadin/server/VaadinService.java | 9 | ||||
-rw-r--r-- | uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/server/src/main/java/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java index 896fc7516e..ada9a8b875 100644 --- a/server/src/main/java/com/vaadin/server/VaadinService.java +++ b/server/src/main/java/com/vaadin/server/VaadinService.java @@ -134,7 +134,7 @@ public abstract class VaadinService implements Serializable { private Iterable<RequestHandler> requestHandlers; - private boolean atmosphereAvailable = checkAtmosphereSupport(); + private Boolean atmosphereAvailable = null; /** * Keeps track of whether a warning about missing push support has already @@ -1652,7 +1652,7 @@ public abstract class VaadinService implements Serializable { * is not available. */ public boolean ensurePushAvailable() { - if (atmosphereAvailable) { + if (isAtmosphereAvailable()) { return true; } else { if (!pushWarningEmitted) { @@ -1664,7 +1664,7 @@ public abstract class VaadinService implements Serializable { } } - private static boolean checkAtmosphereSupport() { + private boolean checkAtmosphereSupport() { String rawVersion = AtmospherePushConnection.getAtmosphereVersion(); if (rawVersion == null) { return false; @@ -1687,6 +1687,9 @@ public abstract class VaadinService implements Serializable { * @return true if Atmosphere is available, false otherwise */ protected boolean isAtmosphereAvailable() { + if (atmosphereAvailable == null) { + atmosphereAvailable = checkAtmosphereSupport(); + } return atmosphereAvailable; } diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index 046694676b..b044571ca3 100644 --- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -25,7 +25,7 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { // Chrome version does not necessarily match the desired version // because of auto updates... browserIdentifier = getExpectedUserAgentString( - getDesiredCapabilities()) + "86"; + getDesiredCapabilities()) + "87"; } else { browserIdentifier = getExpectedUserAgentString(desiredCapabilities) + desiredCapabilities.getVersion(); |