Patch incorporates Ray's comments on the deadlock fix and fixes checkstyle issues.
Patch by: amitmanjhi
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6261 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java b/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java
index 776dfc6..9b5da19 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java
@@ -63,7 +63,7 @@
private final String url;
private final String versionString;
private boolean connected = false;
- boolean shouldDisconnect = false;
+ private boolean shouldDisconnect = false;
public BrowserChannelClient(String addressParts[], String url,
String sessionKey, String moduleName, String versionString,
@@ -135,6 +135,10 @@
return returnMessage;
}
+ void setShouldDisconnect() {
+ shouldDisconnect = true;
+ }
+
/*
* Perform the initial interaction. Return true if interaction succeeds, false
* if it fails. Do a check protocol versions, expected with 2.0+ oophm
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java b/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
index 64c85f0..876b03d 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
@@ -211,7 +211,7 @@
if (!newUrl.equals(currentUrl)) {
// TODO: removeAllJobs for all windows?
window.getWebWindow().getTopWindow().getJobManager().removeAllJobs();
- ((BrowserChannelClient) channel).shouldDisconnect = true;
+ ((BrowserChannelClient) channel).setShouldDisconnect();
}
}
result = jsEngine.callFunction(htmlPage, jsFunction, jsContext, window,
