From f87be1cf342b23cf048b5c0e77559be3d7eed2b3 Mon Sep 17 00:00:00 2001 From: Automerge Date: Fri, 13 Apr 2012 09:13:41 +0000 Subject: [PATCH] [merge from 6.7] VConsole.error() instead of throwing in startRequest() and endRequest() sanity checks svn changeset:23527/svn branch:6.8 --- .../vaadin/terminal/gwt/client/ApplicationConnection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index a452cfff2d..7a3a28495a 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -738,8 +738,7 @@ public class ApplicationConnection { protected void startRequest() { if (hasActiveRequest) { - throw new IllegalStateException( - "Trying to start a new request while another is active"); + VConsole.error("Trying to start a new request while another is active"); } hasActiveRequest = true; requestStartTime = new Date(); @@ -766,7 +765,7 @@ public class ApplicationConnection { protected void endRequest() { if (!hasActiveRequest) { - throw new IllegalStateException("No active request"); + VConsole.error("No active request"); } // After checkForPendingVariableBursts() there may be a new active // request, so we must set hasActiveRequest to false before, not after, -- 2.39.5