--- old/src/share/classes/java/util/HashMap.java	2012-06-03 22:51:46.000000000 -0700
+++ new/src/share/classes/java/util/HashMap.java	2012-06-03 22:51:46.000000000 -0700
@@ -186,7 +186,7 @@
      * {@code 2147483648 } ({@code Integer.MAX_VALUE}) value ensures that
      * alternative hashing is never used.
      */
-    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 0;
+    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 512;
 
     /**
      * holds values which can't be initialized until after VM is booted.
--- old/src/share/classes/java/util/Hashtable.java	2012-06-03 22:51:47.000000000 -0700
+++ new/src/share/classes/java/util/Hashtable.java	2012-06-03 22:51:47.000000000 -0700
@@ -174,7 +174,7 @@
      * {@code 2147483648 } ({@code Integer.MAX_VALUE}) value ensures that
      * alternative hashing is never used.
      */
-    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 0;
+    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 512;
 
     /**
      * holds values which can't be initialized until after VM is booted.
@@ -1063,7 +1063,7 @@
      */
     private static class Entry<K,V> implements Map.Entry<K,V> {
         int hash;
-        K key;
+        final K key;
         V value;
         Entry<K,V> next;
 
--- old/src/share/classes/java/util/WeakHashMap.java	2012-06-03 22:51:47.000000000 -0700
+++ new/src/share/classes/java/util/WeakHashMap.java	2012-06-03 22:51:47.000000000 -0700
@@ -195,7 +195,7 @@
     * whereas {@code 2147483648 } ({@code Integer.MAX_VALUE}) value ensures
     * that alternative hashing is never used.
     */
-    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 0;
+    static final int ALTERNATE_HASHING_THRESHOLD_DEFAULT = 512;
 
     /**
      * holds values which can't be initialized until after VM is booted.