diff --git a/src/share/classes/java/util/HashMap.java b/src/share/classes/java/util/HashMap.java
index c2aace9db8fbc7dc70301e8b6a95ac4b91f7995d..8dfafac8642df11bd6139de8c030397dbdf95c7c 100644
--- a/src/share/classes/java/util/HashMap.java
+++ b/src/share/classes/java/util/HashMap.java
@@ -876,13 +876,9 @@ public class HashMap<K,V>
 
     private static int roundUpToPowerOf2(int number) {
         // assert number >= 0 : "number must be non-negative";
-        int rounded = number >= MAXIMUM_CAPACITY
+        return number >= MAXIMUM_CAPACITY
                 ? MAXIMUM_CAPACITY
-                : (rounded = Integer.highestOneBit(number)) != 0
-                    ? (Integer.bitCount(number) > 1) ? rounded << 1 : rounded
-                    : 1;
-
-        return rounded;
+                : (number > 1) ? Integer.highestOneBit((number - 1) << 1) : 1;
     }
 
     /**