aboutsummaryrefslogtreecommitdiff
path: root/patches/boot/revert-6941137.patch
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-05-08 12:52:58 +0200
committerGuido Günther <agx@sigxcpu.org>2013-05-08 12:52:58 +0200
commit9a8e56049ebf9f0878c7fe3efc0921df8aa6a0ba (patch)
tree7d61a00fa8d6ec4667663370cc42b04be03ec569 /patches/boot/revert-6941137.patch
Imported Upstream version 7u21-2.3.9upstream/7u21-2.3.9upstream
Diffstat (limited to 'patches/boot/revert-6941137.patch')
-rw-r--r--patches/boot/revert-6941137.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/patches/boot/revert-6941137.patch b/patches/boot/revert-6941137.patch
new file mode 100644
index 0000000..3fd2f7c
--- /dev/null
+++ b/patches/boot/revert-6941137.patch
@@ -0,0 +1,12 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-11 00:38:11.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-14 01:44:11.082438342 +0100
+@@ -486,7 +486,7 @@
+ String otherDir = getZoneInfoDir(homeDir);
+ if (otherDir != null)
+ zi = otherDir;
+- zi = FileSystems.getDefault().getPath(zi).toRealPath().toString();
++ zi = new File(zi).getCanonicalPath();
+ } catch(Exception e) {
+ }
+ return zi;