From 04816adee5a20fcee1200ac7f51dc9fc54074ee5 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 9 Oct 2012 09:59:05 -0700
Subject: [PATCH] 7200341: DateFormatSymbols.hashCode() throws
 ArrayIndexOutOfBoundsException in some circumstances

Reviewed-by: okutsu
---
 .../classes/java/text/DateFormatSymbols.java  |  36 +++++++++++++++---
 .../DateFormatSymbolsProviderTest.java        |  14 +++++++
 .../DateFormatSymbolsProviderTest.sh          |   2 +-
 .../java/util/PluggableLocale/fooprovider.jar | Bin 16789 -> 16866 bytes
 .../DateFormatSymbolsProviderImpl.java        |   5 +++
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/classes/java/text/DateFormatSymbols.java b/jdk/src/share/classes/java/text/DateFormatSymbols.java
index 3e701b13799..ee688abd9b6 100644
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java
@@ -45,6 +45,7 @@ import java.lang.ref.SoftReference;
 import java.text.spi.DateFormatSymbolsProvider;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
@@ -366,6 +367,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setEras(String[] newEras) {
         eras = Arrays.copyOf(newEras, newEras.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -393,6 +395,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setMonths(String[] newMonths) {
         months = Arrays.copyOf(newMonths, newMonths.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -420,6 +423,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setShortMonths(String[] newShortMonths) {
         shortMonths = Arrays.copyOf(newShortMonths, newShortMonths.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -439,6 +443,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setWeekdays(String[] newWeekdays) {
         weekdays = Arrays.copyOf(newWeekdays, newWeekdays.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -458,6 +463,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setShortWeekdays(String[] newShortWeekdays) {
         shortWeekdays = Arrays.copyOf(newShortWeekdays, newShortWeekdays.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -474,6 +480,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public void setAmPmStrings(String[] newAmpms) {
         ampms = Arrays.copyOf(newAmpms, newAmpms.length);
+        cachedHashCode = 0;
     }
 
     /**
@@ -558,6 +565,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
         }
         zoneStrings = aCopy;
         isZoneStringsSet = true;
+        cachedHashCode = 0;
     }
 
     /**
@@ -576,6 +584,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
     public void setLocalPatternChars(String newLocalPatternChars) {
         // Call toString() to throw an NPE in case the argument is null
         localPatternChars = newLocalPatternChars.toString();
+        cachedHashCode = 0;
     }
 
     /**
@@ -597,12 +606,23 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * Override hashCode.
      * Generates a hash code for the DateFormatSymbols object.
      */
+    @Override
     public int hashCode() {
-        int hashcode = 0;
-        String[][] zoneStrings = getZoneStringsWrapper();
-        for (int index = 0; index < zoneStrings[0].length; ++index)
-            hashcode ^= zoneStrings[0][index].hashCode();
-        return hashcode;
+        int hashCode = cachedHashCode;
+        if (hashCode == 0) {
+            hashCode = 5;
+            hashCode = 11 * hashCode + Arrays.hashCode(eras);
+            hashCode = 11 * hashCode + Arrays.hashCode(months);
+            hashCode = 11 * hashCode + Arrays.hashCode(shortMonths);
+            hashCode = 11 * hashCode + Arrays.hashCode(weekdays);
+            hashCode = 11 * hashCode + Arrays.hashCode(shortWeekdays);
+            hashCode = 11 * hashCode + Arrays.hashCode(ampms);
+            hashCode = 11 * hashCode + Arrays.deepHashCode(getZoneStringsWrapper());
+            hashCode = 11 * hashCode + Objects.hashCode(localPatternChars);
+            cachedHashCode = hashCode;
+        }
+
+        return hashCode;
     }
 
     /**
@@ -641,6 +661,11 @@ public class DateFormatSymbols implements Serializable, Cloneable {
 
     private transient int lastZoneIndex = 0;
 
+    /**
+     * Cached hash code
+     */
+    transient volatile int cachedHashCode = 0;
+
     private void initializeData(Locale desiredLocale) {
         locale = desiredLocale;
 
@@ -782,6 +807,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
             dst.zoneStrings = null;
         }
         dst.localPatternChars = src.localPatternChars;
+        dst.cachedHashCode = 0;
     }
 
     /**
diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
index 20547219f53..44d537b25ca 100644
--- a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
+++ b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java
@@ -44,6 +44,7 @@ public class DateFormatSymbolsProviderTest extends ProviderTest {
     DateFormatSymbolsProviderTest() {
         availableLocalesTest();
         objectValidityTest();
+        hashCodeTest();
     }
 
     void availableLocalesTest() {
@@ -124,4 +125,17 @@ public class DateFormatSymbolsProviderTest extends ProviderTest {
             }
         }
     }
+
+    // Bug 7200341.
+    void hashCodeTest() {
+        for (Locale target: availloc) {
+            // look for provider's object
+            DateFormatSymbols dfs = DateFormatSymbols.getInstance(target);
+            if (dfs.getClass().getSimpleName().equals("FooDateFormatSymbols")) {
+                // call its hashCode(). success if no ArrayIndexOutOfBoundsException is thrown.
+                dfs.hashCode();
+                break;
+            }
+        }
+    }
 }
diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
index 22c97d0a1ad..24129cd81d7 100644
--- a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
+++ b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh
@@ -23,6 +23,6 @@
 #!/bin/sh
 #
 # @test
-# @bug 4052440
+# @bug 4052440 7200341
 # @summary DateFormatSymbolsProvider tests
 # @run shell ExecTest.sh foo DateFormatSymbolsProviderTest true
diff --git a/jdk/test/java/util/PluggableLocale/fooprovider.jar b/jdk/test/java/util/PluggableLocale/fooprovider.jar
index c1b5723f9b95dad064ed0393dd878cd7d82f3c51..125dbe17756199ab64388fa372f656af7e74440d 100644
GIT binary patch
delta 5263
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
Xm!zd3AUt0I{n^ERmU#K%=e_>{Yda@Y

delta 5241
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

diff --git a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java b/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
index 34a201afb87..5c96fb28f88 100644
--- a/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
+++ b/jdk/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java
@@ -221,5 +221,10 @@ public class DateFormatSymbolsProviderImpl extends DateFormatSymbolsProvider {
         public void setAmPmStrings(String[] newAmpms) {
             ampms = newAmpms;
         }
+
+        @Override
+        public String[][] getZoneStrings() {
+            return new String[0][0];
+        }
     }
 }