Revision: 6261 Author: [email protected] Date: Wed Sep 30 09:31:26 2009 Log: Patch incorporates Ray's comments on the deadlock fix and fixes checkstyle issues.
Patch by: amitmanjhi http://code.google.com/p/google-web-toolkit/source/detail?r=6261 Modified: /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java ======================================= --- /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java Tue Sep 29 19:37:53 2009 +++ /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java Wed Sep 30 09:31:26 2009 @@ -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 ======================================= --- /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Tue Sep 29 19:37:53 2009 +++ /branches/farewellSwt/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Wed Sep 30 09:31:26 2009 @@ -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, --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
