changeset 8136:09f3004e9b12 jdk7u76-b31

Merge
author asaha
date Mon, 05 Jan 2015 11:57:27 -0800
parents 4d5a0c5fe452 82b308867300
children 4dafad00ed88 cf89305f0d47
files .hgtags src/share/classes/java/util/CurrencyData.properties
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 29 12:02:47 2014 -0800
+++ b/.hgtags	Mon Jan 05 11:57:27 2015 -0800
@@ -526,6 +526,7 @@
 1a37584734ff241c0c4c4382f7870efedef7e706 jdk7u75-b12
 16043c4cefc3cc5d859d97434abbdf79a7a58e49 jdk7u75-b13
 3778e2621fc972f88ac8a247543ad63527e7d9cd jdk7u75-b30
+cc9469a8208838cc4adec61acf0429c17622e75b jdk7u75-b31
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
--- a/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	Mon Dec 29 12:02:47 2014 -0800
+++ b/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	Mon Jan 05 11:57:27 2015 -0800
@@ -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 10 years from present: " + time + " " + timeString + " " + currencyInfo);
             }
             specialCaseCutOverTimes[specialCaseCount] = time;
             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;