--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Thu Oct 17 22:22:14 2013 -0700
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Thu Oct 17 23:43:08 2013 -0700
@@ -26,6 +26,7 @@
package sun.util.calendar;
import java.io.ByteArrayInputStream;
+import java.io.BufferedInputStream;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.File;
@@ -243,7 +244,8 @@
try {
String libDir = System.getProperty("java.home") + File.separator + "lib";
try (DataInputStream dis = new DataInputStream(
- new FileInputStream(new File(libDir, "tzdb.dat")))) {
+ new BufferedInputStream(new FileInputStream(
+ new File(libDir, "tzdb.dat"))))) {
load(dis);
}
} catch (Exception x) {
@@ -265,6 +267,10 @@
}
}
+ public static boolean useOldMapping() {
+ return USE_OLDMAPPING;
+ }
+
/**
* Loads the rules from a DateInputStream
*