HashMap coding error

BobHanson · BobHanson · commit 1debf4944e6c · 2020-06-15T12:58:27.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/util/HashMap.java b/sources/net.sf.j2s.java.core/src/java/util/HashMap.java
@@ -497,7 +497,7 @@ public HashMap(Map<? extends K, ? extends V> m) {
 	}
 
 	/**
-	 * Implements Map.putAll and Map constructor
+	 * Implements clone, Map.putAll and Map constructor
 	 *
 	 * @param mOriginal     the map
 	 * @param evict false when initially constructing this map, else true (relayed
@@ -541,8 +541,11 @@ void putMapEntries(Map<? extends K, ? extends V> mOriginal, boolean evict) {
 			return;
 		} 
 		秘m = null;
+		
 		for (Map.Entry<? extends K, ? extends V> e : mOriginal.entrySet()) {
-			putVal(hash(key), e.getKey(), e.getValue(), false, evict, NOT_SIMPLE);
+	        key = e.getKey();
+	        value = e.getValue();
+			putVal(hash(key), key, value, false, evict, NOT_SIMPLE);
 		}
 	
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Map.java b/sources/net.sf.j2s.java.core/src/test/Test_Map.java
@@ -10,6 +10,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Spliterator;
+import java.util.TreeMap;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -97,6 +98,9 @@ public static void main(String[] args) {
 		System.out.println(System.identityHashCode(new String("test")));
 		System.out.println(System.identityHashCode(new String("test")));
 		System.out.println(System.identityHashCode(new String("test")));
+
+		testMap();
+		
 		testSets(); 
 		
 		testIdentity();
@@ -107,6 +111,46 @@ public static void main(String[] args) {
 		System.out.println("Test_Map OK");
 	}
 
+	private static void testMap() {
+		LinkedHashMap<String, String> hm = new LinkedHashMap<>();
+		hm.put("key1",  "v1");
+		hm.put("key3",  "v3");
+		hm.put("key2",  "v2");
+		
+		LinkedHashMap<String, String> hm1 = (LinkedHashMap<String, String>) hm.clone();
+		
+		assert(hm1.get("key1") == "v1");	
+		assert(hm1.get("key2") == "v2");
+		assert(hm1.get("key3") == "v3");
+		
+		for (String k : hm.keySet()) {
+			System.out.println(k);
+		}
+		
+		
+		LinkedHashMap<Object, String> hm2 = new LinkedHashMap<>();
+		hm2.put(new int[] {1,2,3}, "[123]");
+		hm2.put(new int[] {2, 3, 4}, "[234]");
+		System.out.println(hm2.get(new int[] {1,2,3}));
+
+		TreeMap<String, String> hm3 = new TreeMap<>();
+		hm3.put("key1",  "v1");
+		hm3.put("key3",  "v3");
+		hm3.put("key2",  "v2");
+		
+		assert(hm3.get("key1") == "v1");	
+		assert(hm3.get("key2") == "v2");
+		assert(hm3.get("key3") == "v3");
+
+		String k0 = "key0";
+		for (String k : hm3.keySet()) {
+			System.out.println(k);
+			assert (k0.compareTo(k) == -1);
+			k0 = k;
+		}
+		
+	}
+
 	class MySet {
 
 		public int hashCode() {

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ public HashMap(Map<? extends K, ? extends V> m) {`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`/**`
`500`		`- * Implements Map.putAll and Map constructor`
	`500`	`+ * Implements clone, Map.putAll and Map constructor`
`501`	`501`	`*`
`502`	`502`	`* @param mOriginal the map`
`503`	`503`	`* @param evict false when initially constructing this map, else true (relayed`
`@@ -541,8 +541,11 @@ void putMapEntries(Map<? extends K, ? extends V> mOriginal, boolean evict) {`
`541`	`541`	`return;`
`542`	`542`	`}`
`543`	`543`	`秘m = null;`
	`544`	`+`
`544`	`545`	`for (Map.Entry<? extends K, ? extends V> e : mOriginal.entrySet()) {`
`545`		`- putVal(hash(key), e.getKey(), e.getValue(), false, evict, NOT_SIMPLE);`
	`546`	`+ key = e.getKey();`
	`547`	`+ value = e.getValue();`
	`548`	`+ putVal(hash(key), key, value, false, evict, NOT_SIMPLE);`
`546`	`549`	`}`
`547`	`550`
`548`	`551`	`}`