Revision: 6885
Author: jlaba...@google.com
Date: Thu Nov 12 14:39:43 2009
Log: tr...@6884 was merged into this branch
  Synchronizing OophmSessionHandler#loadModule() to prevent multiple modules  
from loading at the same time.
     svn merge --ignore-ancestry -c6884  
http://google-web-toolkit.googlecode.com/svn/trunk/ .

Patch by: jlabanca


http://code.google.com/p/google-web-toolkit/source/detail?r=6885

Modified:
  /releases/2.0/branch-info.txt
   
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java

=======================================
--- /releases/2.0/branch-info.txt       Thu Nov 12 13:32:27 2009
+++ /releases/2.0/branch-info.txt       Thu Nov 12 14:39:43 2009
@@ -614,3 +614,6 @@
   Adds a start() method to MessageTransport
      svn merge --ignore-ancestry -c6880  
http://google-web-toolkit.googlecode.com/svn/trunk/ .

+tr...@6884 was merged into this branch
+ Synchronizing OophmSessionHandler#loadModule() to prevent multiple  
modules from loading at the same time.
+    svn merge --ignore-ancestry -c6884  
http://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
---  
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java    
 
Wed Nov 11 11:04:31 2009
+++  
/releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java    
 
Thu Nov 12 14:39:43 2009
@@ -155,7 +155,7 @@
    }

    @Override
-  public TreeLogger loadModule(TreeLogger loadModuleLogger,
+  public synchronized TreeLogger loadModule(TreeLogger loadModuleLogger,
        BrowserChannel channel, String moduleName, String userAgent, String  
url,
        String tabKey, String sessionKey, byte[] userAgentIcon) {
      logger = loadModuleLogger;

-- 
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to