Revision: 6988
Author: [email protected]
Date: Wed Nov 18 09:04:51 2009
Log: Merge tr...@6982 to fix XHR memory leak.
$ svn merge --ignore-ancestry -c6982  
https://google-web-toolkit.googlecode.com/svn/trunk .


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

Modified:
  /releases/2.0/branch-info.txt
  /releases/2.0/user/src/com/google/gwt/xhr/client/XMLHttpRequest.java

=======================================
--- /releases/2.0/branch-info.txt       Wed Nov 18 08:54:38 2009
+++ /releases/2.0/branch-info.txt       Wed Nov 18 09:04:51 2009
@@ -765,3 +765,8 @@
        https://google-web-toolkit.googlecode.com/svn/trunk/ .
      svn merge --ignore-ancestry -r6983:6985 \
        https://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@6982 was merged into this branch
+  Get the XHR memory leak fixed correctly
+  svn merge --ignore-ancestry -c6982  
https://google-web-toolkit.googlecode.com/svn/trunk .
+
=======================================
--- /releases/2.0/user/src/com/google/gwt/xhr/client/XMLHttpRequest.java        
 
Mon Nov 16 12:53:35 2009
+++ /releases/2.0/user/src/com/google/gwt/xhr/client/XMLHttpRequest.java        
 
Wed Nov 18 09:04:51 2009
@@ -75,6 +75,13 @@
     */
    public static final int DONE = 4;

+  /**
+   * This is used to clear the onReadyStateChange handler. It is used by
+   * {...@link #clearOnReadyStateChange()}.
+   */
+  @SuppressWarnings("unused")
+  private static final JavaScriptObject NULL_FUNCTION =  
JavaScriptObject.createFunction();
+
    /**
     * Creates an XMLHttpRequest object.
     *
@@ -113,7 +120,7 @@
    public final native void clearOnReadyStateChange() /*-{
      var self = this;
      $wnd.setTimeout(function() {
-      self.onreadystatechange = function(){};
+      self.onreadystatechange =  
@com.google.gwt.xhr.client.XMLHttpRequest::NULL_FUNCTION;
      }, 0);
    }-*/;

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

Reply via email to