Revision: 6313 Author: [email protected] Date: Wed Oct 7 09:24:31 2009 Log: Move icon request to after we actually have the user agent, clean up test code warnings.
Patch by: jat http://code.google.com/p/google-web-toolkit/source/detail?r=6313 Modified: /changes/jat/abstractui/dev/core/test/com/google/gwt/dev/shell/BrowserChannelServerTest.java /changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java ======================================= --- /changes/jat/abstractui/dev/core/test/com/google/gwt/dev/shell/BrowserChannelServerTest.java Tue Oct 6 15:59:35 2009 +++ /changes/jat/abstractui/dev/core/test/com/google/gwt/dev/shell/BrowserChannelServerTest.java Wed Oct 7 09:24:31 2009 @@ -208,7 +208,7 @@ assertNull(handler.getSessionKey()); assertNull(handler.getUserAgentIcon()); assertEquals(MessageType.RETURN, type); - ReturnMessage returnMessage = ReturnMessage.receive(client); + ReturnMessage.receive(client); QuitMessage.send(client); server.waitForClose(); assertNull(handler.getLoadedModule()); @@ -246,7 +246,7 @@ assertEquals("session", handler.getSessionKey()); assertNull(handler.getUserAgentIcon()); assertEquals(MessageType.RETURN, type); - ReturnMessage returnMessage = ReturnMessage.receive(client); + ReturnMessage.receive(client); QuitMessage.send(client); server.waitForClose(); assertNull(handler.getLoadedModule()); @@ -270,14 +270,6 @@ new CheckVersionsMessage(client, 2, 3, HostedHtmlVersion.EXPECTED_GWT_ONLOAD_VERSION).send(); MessageType type = client.readMessageType(); - byte[] iconBytes = null; - if (type == MessageType.REQUEST_ICON) { - RequestIconMessage requestIconlMessage = RequestIconMessage.receive( - client); - iconBytes = new byte[] { 0, 1, 2, 3, 4, 5 }; - UserAgentIconMessage.send(client, iconBytes); - } - type = client.readMessageType(); assertEquals(MessageType.PROTOCOL_VERSION, type); ProtocolVersionMessage protocolMessage = ProtocolVersionMessage.receive( client); @@ -285,6 +277,13 @@ new LoadModuleMessage(client, "url", "tabkey", "session", "testModule", "userAgent").send(); type = client.readMessageType(); + byte[] iconBytes = null; + if (type == MessageType.REQUEST_ICON) { + RequestIconMessage.receive(client); + iconBytes = new byte[] { 0, 1, 2, 3, 4, 5 }; + UserAgentIconMessage.send(client, iconBytes); + type = client.readMessageType(); + } assertEquals("testModule", handler.getModuleName()); assertEquals("userAgent", handler.getUserAgent()); assertEquals("url", handler.getUrl()); @@ -297,7 +296,7 @@ assertEquals(iconBytes[i], receivedIcon[i]); } assertEquals(MessageType.RETURN, type); - ReturnMessage returnMessage = ReturnMessage.receive(client); + ReturnMessage.receive(client); QuitMessage.send(client); server.waitForClose(); assertNull(handler.getLoadedModule()); ======================================= --- /changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java Tue Oct 6 15:59:35 2009 +++ /changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java Wed Oct 7 09:24:31 2009 @@ -264,25 +264,6 @@ new FatalErrorMessage(this, connectError).send(); return; } - if (protocolVersion >= PROTOCOL_VERSION_GET_ICON) { - synchronized (cacheLock) { - if (iconCache.containsKey(userAgent)) { - iconBytes = iconCache.get(userAgent); - } else { - RequestIconMessage.send(this); - type = Message.readMessageType(getStreamFromOtherSide()); - if (type != MessageType.USER_AGENT_ICON) { - logger.log(TreeLogger.ERROR, "Unexpected message type " + type - + "; expecting UserAgentIcon"); - return; - } - UserAgentIconMessage uaIconMessage = UserAgentIconMessage.receive( - this); - iconBytes = uaIconMessage.getIconBytes(); - iconCache.put(userAgent, iconBytes); - } - } - } new ProtocolVersionMessage(this, protocolVersion).send(); type = Message.readMessageType(getStreamFromOtherSide()); @@ -318,6 +299,25 @@ + "; expecting CheckVersions"); return; } + if (protocolVersion >= PROTOCOL_VERSION_GET_ICON) { + synchronized (cacheLock) { + if (iconCache.containsKey(userAgent)) { + iconBytes = iconCache.get(userAgent); + } else { + RequestIconMessage.send(this); + type = Message.readMessageType(getStreamFromOtherSide()); + if (type != MessageType.USER_AGENT_ICON) { + logger.log(TreeLogger.ERROR, "Unexpected message type " + type + + "; expecting UserAgentIcon"); + return; + } + UserAgentIconMessage uaIconMessage = UserAgentIconMessage.receive( + this); + iconBytes = uaIconMessage.getIconBytes(); + iconCache.put(userAgent, iconBytes); + } + } + } Thread.currentThread().setName( "Hosting " + moduleName + " for " + userAgent + " on " + url + " @ " + sessionKey); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
