diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java
index 6aaf7684bf3fc1d5a4d6d9ef403e9359f054e19d..2aead0f545d8038b2b0bfab8e3d43f4eb54c6739 100644
--- a/jdk/src/share/classes/java/lang/String.java
+++ b/jdk/src/share/classes/java/lang/String.java
@@ -1492,7 +1492,7 @@ public final class String
      */
     public int hashCode() {
         int h = hash;
-        if (h == 0) {
+        if (h == 0 && count > 0) {
             int off = offset;
             char val[] = value;
             int len = count;