Revision: 6236 Author: [email protected] Date: Mon Sep 28 10:38:32 2009 Log: Merging tr...@6234:6235 into this branch. - Fixes an NPE in JUnitMessageQueue when a test times out before any client retrieves it.
svn merge -r6234:6235 https://google-web-toolkit.googlecode.com/svn/trunk . http://code.google.com/p/google-web-toolkit/source/detail?r=6236 Modified: /branches/snapshot-2009.09.23-r6200/user/src/com/google/gwt/junit/JUnitMessageQueue.java ======================================= --- /branches/snapshot-2009.09.23-r6200/user/src/com/google/gwt/junit/JUnitMessageQueue.java Tue Sep 15 11:52:45 2009 +++ /branches/snapshot-2009.09.23-r6200/user/src/com/google/gwt/junit/JUnitMessageQueue.java Mon Sep 28 10:38:32 2009 @@ -306,7 +306,7 @@ buf.append('\n'); } - if (!results.containsKey(clientStatus.clientId)) { + if (results == null | | !results.containsKey(clientStatus.clientId)) { buf.append(" - NO RESPONSE: "); } else { buf.append(" - (ok): "); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
