Revision: 6406 Author: [email protected] Date: Fri Oct 16 18:12:55 2009 Log: After upgrading HtmlUnit from 2.5 to 2.7-snapshot, sending an explicit QUIT message when the module transition happens does not seem to be required.
Patch by: amitmanjhi Review by: jat (TBR) http://code.google.com/p/google-web-toolkit/source/detail?r=6406 Modified: /trunk/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java /trunk/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java ======================================= --- /trunk/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java Tue Oct 13 16:57:19 2009 +++ /trunk/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelClient.java Fri Oct 16 18:12:55 2009 @@ -63,7 +63,6 @@ private final String url; private final String versionString; private boolean connected = false; - private boolean shouldDisconnect = false; private int protocolVersion; public BrowserChannelClient(String addressParts[], String url, @@ -124,9 +123,6 @@ new LoadModuleMessage(this, url, tabKey, sessionKey, moduleName, htmlUnitSessionHandler.getUserAgent()).send(); returnMessage = reactToMessages(htmlUnitSessionHandler, true); - if (shouldDisconnect) { - disconnectFromHost(); - } } logger.log(TreeLogger.DEBUG, "loaded module, returnValue: " + returnMessage.getReturnValue() + ", isException: " @@ -138,15 +134,8 @@ HtmlUnitSessionHandler handler) throws IOException, BrowserChannelException { ReturnMessage returnMessage = reactToMessages(handler, true); - if (shouldDisconnect) { - disconnectFromHost(); - } return returnMessage; } - - void setShouldDisconnect() { - shouldDisconnect = true; - } /* * Perform the initial interaction. Return true if interaction succeeds, false ======================================= --- /trunk/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Tue Oct 13 16:57:19 2009 +++ /trunk/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Fri Oct 16 18:12:55 2009 @@ -211,7 +211,6 @@ if (!newUrl.equals(currentUrl)) { // TODO: removeAllJobs for all windows? window.getWebWindow().getTopWindow().getJobManager().removeAllJobs(); - ((BrowserChannelClient) channel).setShouldDisconnect(); } } result = jsEngine.callFunction(htmlPage, jsFunction, jsContext, window, --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
