changeset 8174:cf89305f0d47

Merge
author asaha
date Thu, 09 Apr 2015 16:55:10 -0700
parents 9b6eac3464e6 09f3004e9b12
children 95dd5e6c132f
files .hgtags
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 09 16:52:00 2015 -0700
+++ b/.hgtags	Thu Apr 09 16:55:10 2015 -0700
@@ -529,6 +529,8 @@
 7bac76091c46f667f69aa9e426c29cc8e3a2d861 jdk7u75-b11
 1a37584734ff241c0c4c4382f7870efedef7e706 jdk7u75-b12
 16043c4cefc3cc5d859d97434abbdf79a7a58e49 jdk7u75-b13
+3778e2621fc972f88ac8a247543ad63527e7d9cd jdk7u75-b30
+cc9469a8208838cc4adec61acf0429c17622e75b jdk7u75-b31
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
@@ -547,6 +549,7 @@
 e0e3c03502518c460d51d8c517b081cbd712a9c1 jdk7u76-b11
 9af83882ca9e628f9e35634b930081271a91d561 jdk7u76-b12
 1af0023da23e23482947b715fbf3bdfdee0d2813 jdk7u76-b13
+c5567031a820910ded5f20f2d7fa21c433d744ca jdk7u76-b30
 45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00
 2879572fbbb7be4d44e2bcd815711590cc6538e9 jdk7u79-b01
 643cb9ac8b38239c65404daff8cc8d501bafa610 jdk7u79-b02
--- a/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	Thu Apr 09 16:52:00 2015 -0700
+++ b/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	Thu Apr 09 16:55:10 2015 -0700
@@ -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;