Merge pull request #5241 from bjhargrave/remove-store

immutable: Remove a variable store in a loop
bndtools · May 6, 2022 · 484abbf · 484abbf
2 parents 815cb77 + 81fb609
commit 484abbf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/biz.aQute.bnd.util/src/aQute/bnd/unmodifiable/ImmutableMap.java b/biz.aQute.bnd.util/src/aQute/bnd/unmodifiable/ImmutableMap.java
@@ -42,14 +42,14 @@ private static short[] hash(Object[] entries) {
 			throw new IllegalArgumentException("map too large: " + length);
 		}
 		short[] hash_bucket = new short[length * 2];
-		for (int slot = 0, index = 0; slot < length;) {
-			Object key = entries[index++];
+		for (int slot = 0, index = 0; slot < length; index += 2) {
+			Object key = entries[index];
 			int hash = -1 - linear_probe(entries, hash_bucket, key);
 			if (hash < 0) {
 				throw new IllegalArgumentException("duplicate key: " + key);
 			}
 			hash_bucket[hash] = (short) ++slot;
-			requireNonNull(entries[index++]);
+			requireNonNull(entries[index + 1]);
 		}
 		return hash_bucket;
 	}