aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/ui')
-rw-r--r--server/src/com/vaadin/ui/UI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index adba9bd83e..961ed289f3 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -1186,7 +1186,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements
* should only be called by the framework.
*/
public void setPushConnection(PushConnection pushConnection) {
- assert (pushConnection != null) == (getPushMode().isEnabled());
+ // If pushMode is disabled then there should never be a pushConnection
+ assert (getPushMode().isEnabled() || pushConnection == null);
if (pushConnection == this.pushConnection) {
return;