[gwt-contrib] [google-web-toolkit commit] r5134 - SQUASH into Collections commit; serialization bug reading size then adding to it.

[codesite-noreply]

Author: sco...@google.com
Date: Tue Mar 31 10:33:49 2009
New Revision: 5134

Modified:
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashSet.java

Log:
SQUASH into Collections commit; serialization bug reading size then adding  
to it.

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java 
 
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashMap.java 
 
Tue Mar 31 10:33:49 2009
@@ -408,11 +408,20 @@
      return (k == NULL_KEY) ? null : k;
    }

-  Object[] keys;
+  /**
+   * Backing store for all the keys; transient due to custom serialization.
+   */
+  transient Object[] keys;

-  int size = 0;
+  /**
+   * Number of pairs in this set; transient due to custom serialization.
+   */
+  transient int size = 0;

-  Object[] values;
+  /**
+   * Backing store for all the values; transient due to custom  
serialization.
+   */
+  transient Object[] values;

    public HashMap() {
      initTable(4);

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashSet.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashSet.java 
 
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/util/collect/HashSet.java 
 
Tue Mar 31 10:33:49 2009
@@ -88,9 +88,15 @@
      return (o == NULL_ITEM) ? null : o;
    }

-  private int size = 0;
+  /**
+   * Number of objects in this set; transient due to custom serialization.
+   */
+  transient int size = 0;

-  private Object[] table;
+  /**
+   * Backing store for all the objects; transient due to custom  
serialization.
+   */
+  transient Object[] table;

    public HashSet() {
      table = new Object[4];

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