646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
15 lines
1.2 KiB
Diff
15 lines
1.2 KiB
Diff
diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
|
--- openjdk-7u65-b32-upstream/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-07-17 05:42:14.000000000 -0430
|
|
+++ openjdk-7u65-b32/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430
|
|
@@ -281,8 +281,8 @@
|
|
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);
|
|
+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
|
|
+ throw new RuntimeException("time is more than 20 years from present: " + time);
|
|
}
|
|
specialCaseCutOverTimes[specialCaseCount] = time;
|
|
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
|