Revision: 6286 Author: [email protected] Date: Fri Oct 2 09:35:30 2009 Log: Fix Restart Server showing up, infinite recursion in event callback.
http://code.google.com/p/google-web-toolkit/source/detail?r=6286 Modified: /changes/jat/abstractui/dev/core/src/com/google/gwt/dev/HostedModeBase.java /changes/jat/abstractui/dev/oophm/overlay/com/google/gwt/dev/HostedMode.java ======================================= --- /changes/jat/abstractui/dev/core/src/com/google/gwt/dev/HostedModeBase.java Fri Oct 2 08:37:20 2009 +++ /changes/jat/abstractui/dev/core/src/com/google/gwt/dev/HostedModeBase.java Fri Oct 2 09:35:30 2009 @@ -187,7 +187,7 @@ protected void callback(String event, Object callbackData) { Callback callback = callbacks.get(event); if (callback != null) { - callback(event, callbackData); + callback.callback(event, callbackData); } } ======================================= --- /changes/jat/abstractui/dev/oophm/overlay/com/google/gwt/dev/HostedMode.java Fri Oct 2 08:37:20 2009 +++ /changes/jat/abstractui/dev/oophm/overlay/com/google/gwt/dev/HostedMode.java Fri Oct 2 09:35:30 2009 @@ -376,21 +376,21 @@ @Override protected int doStartUpServer() { try { - TreeLogger serverLogger = ui.getWebServerLogger(getWebServerName(), null); - serverLogger.log(TreeLogger.INFO, "Starting HTTP on port " + getPort(), - null); - server = options.getServletContainerLauncher().start(serverLogger, - getPort(), options.getWarDir()); - assert (server != null); ui.setCallback(DevelopmentModeUI.RESTART_SERVER, new Callback() { public void callback(String event, Object callbackData) { try { server.refresh(); } catch (UnableToCompleteException e) { - // ingore, problem already logged + // ignore, problem already logged } } }); + TreeLogger serverLogger = ui.getWebServerLogger(getWebServerName(), null); + serverLogger.log(TreeLogger.INFO, "Starting HTTP on port " + getPort(), + null); + server = options.getServletContainerLauncher().start(serverLogger, + getPort(), options.getWarDir()); + assert (server != null); return server.getPort(); } catch (BindException e) { System.err.println("Port " @@ -400,6 +400,7 @@ System.err.println("Unable to start embedded HTTP server"); e.printStackTrace(); } + ui.setCallback(DevelopmentModeUI.RESTART_SERVER, null); return -1; } --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
