summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAutomerge <automerge@vaadin.com>2012-03-30 13:24:26 +0000
committerAutomerge <automerge@vaadin.com>2012-03-30 13:24:26 +0000
commita3ab33f6d154a794c0940d49619a2b95b39bf006 (patch)
tree54e52a827e6ef521d3398078d5e1d35af3156a5d /src
parent9c7035cbe2f1ad2b89308bbb490674667f9ee522 (diff)
downloadvaadin-framework-a3ab33f6d154a794c0940d49619a2b95b39bf006.tar.gz
vaadin-framework-a3ab33f6d154a794c0940d49619a2b95b39bf006.zip
[merge from 6.7] #8580 Added a comment
svn changeset:23371/svn branch:6.8
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ApplicationConnection.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index dd998e760c..a452cfff2d 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -768,6 +768,10 @@ public class ApplicationConnection {
if (!hasActiveRequest) {
throw new IllegalStateException("No active request");
}
+ // After checkForPendingVariableBursts() there may be a new active
+ // request, so we must set hasActiveRequest to false before, not after,
+ // the call. Active requests used to be tracked with an integer counter,
+ // so setting it after used to work but not with the #8505 changes.
hasActiveRequest = false;
if (applicationRunning) {
checkForPendingVariableBursts();