From: Automerge <automerge@vaadin.com>
Date: Fri, 30 Mar 2012 13:24:26 +0000 (+0000)
Subject: [merge from 6.7] #8580 Added a comment
X-Git-Tag: 7.0.0.alpha2~175^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a3ab33f6d154a794c0940d49619a2b95b39bf006;p=vaadin-framework.git

[merge from 6.7] #8580 Added a comment

svn changeset:23371/svn branch:6.8
---

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();