diff options
-rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch | 25 | ||||
-rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch new file mode 100644 index 0000000..6dd36af --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Gonzalez <alex.gonzalez@digi.com> | ||
3 | Date: Wed, 31 Dec 2014 16:07:32 +0100 | ||
4 | Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration | ||
5 | date | ||
6 | |||
7 | Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> | ||
8 | --- | ||
9 | .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- | ||
10 | 1 file changed, 3 deletions(-) | ||
11 | |||
12 | diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
13 | index bf335fa22c1d..0e421360fef9 100644 | ||
14 | --- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
15 | +++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
16 | @@ -281,9 +281,6 @@ public class GenerateCurrencyData { | ||
17 | checkCurrencyCode(newCurrency); | ||
18 | String timeString = currencyInfo.substring(4, length - 4); | ||
19 | long time = format.parse(timeString).getTime(); | ||
20 | - if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { | ||
21 | - throw new RuntimeException("time is more than 10 years from present: " + time); | ||
22 | - } | ||
23 | specialCaseCutOverTimes[specialCaseCount] = time; | ||
24 | specialCaseOldCurrencies[specialCaseCount] = oldCurrency; | ||
25 | specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); | ||
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 1f3533c..47813cd 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc | |||
@@ -80,6 +80,7 @@ OPENJDK_PATCHES = " \ | |||
80 | file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ | 80 | file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ |
81 | file://icedtea-jdk-sane-x86-arch.patch;apply=no \ | 81 | file://icedtea-jdk-sane-x86-arch.patch;apply=no \ |
82 | file://icedtea-flags.patch;apply=no \ | 82 | file://icedtea-flags.patch;apply=no \ |
83 | file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \ | ||
83 | " | 84 | " |
84 | 85 | ||
85 | export DISTRIBUTION_PATCHES = " \ | 86 | export DISTRIBUTION_PATCHES = " \ |
@@ -89,4 +90,5 @@ export DISTRIBUTION_PATCHES = " \ | |||
89 | patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ | 90 | patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ |
90 | patches/icedtea-jdk-sane-x86-arch.patch \ | 91 | patches/icedtea-jdk-sane-x86-arch.patch \ |
91 | patches/icedtea-flags.patch \ | 92 | patches/icedtea-flags.patch \ |
93 | patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \ | ||
92 | " | 94 | " |