summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-04-25 20:39:48 +0300
committerArtur Signell <artur@vaadin.com>2013-04-25 20:42:23 +0300
commitf73da53c7d8d950952fb1a0c8469bca7ca5d9386 (patch)
treeca7e9dd7ff524628fae173bf21071e8eaa8c8c14
parenta46c97bd7936ea8793618bb54ce19ac32c61f71d (diff)
downloadvaadin-framework-f73da53c7d8d950952fb1a0c8469bca7ca5d9386.tar.gz
vaadin-framework-f73da53c7d8d950952fb1a0c8469bca7ca5d9386.zip
Fixed incorrect assert (#11720)
Change-Id: I723230420c893ed9d5f498309b0763afaf55d6a5
-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;