Merge pull request #4 from vladak/10years

psumbera · web-flow · commit ee8e2a09c57c · 2025-06-02T17:36:15.000+02:00
patch the 10 years check away
diff --git a/patches-10/Solaris11-10years.patch b/patches-10/Solaris11-10years.patch
@@ -0,0 +1,12 @@
+--- make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java.orig	2025-06-02 15:19:22.778297762 +0000
++++ make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java	2025-06-02 15:19:34.717245341 +0000
+@@ -284,9 +284,6 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
+-            }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
+             specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
diff --git a/patches-10/series b/patches-10/series
@@ -1,3 +1,4 @@
 Solaris11-EM_486.patch -p0
 Solaris11-TRAPNO.patch -p0
 Solaris11-caddr32.patch -p0
+Solaris11-10years.patch -p0
diff --git a/patches-9/Solaris11-10years.patch b/patches-9/Solaris11-10years.patch
@@ -0,0 +1,12 @@
+--- jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java.orig	2025-06-02 15:08:19.382852914 +0000
++++ jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java	2025-06-02 15:08:33.983873597 +0000
+@@ -284,9 +284,6 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
+-            }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
+             specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
diff --git a/patches-9/series b/patches-9/series
@@ -1,3 +1,4 @@
 Solaris11-EM_486.patch -p0
 Solaris11-TRAPNO.patch -p0
 Solaris11-caddr32.patch -p0
+Solaris11-10years.patch -p0
