From 8e22767a9786f72245b4bc3d3439ba63aae59fb7bab86f7ae0af19dfe197a9d4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 30 Sep 2017 19:19:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=257 --- alternative-tzdb_dat.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/alternative-tzdb_dat.patch b/alternative-tzdb_dat.patch index fb1fdc1..10aa9f4 100644 --- a/alternative-tzdb_dat.patch +++ b/alternative-tzdb_dat.patch @@ -1,5 +1,5 @@ --- openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2017-07-27 02:47:51.000000000 +0200 -+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2017-09-28 17:44:23.511675990 +0200 ++++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2017-09-30 21:18:06.562932697 +0200 @@ -31,6 +31,7 @@ import java.io.DataInputStream; import java.io.File; @@ -16,14 +16,12 @@ import java.util.Set; import java.util.SimpleTimeZone; import java.util.concurrent.ConcurrentHashMap; -@@ -251,7 +253,17 @@ +@@ -251,7 +253,15 @@ AccessController.doPrivileged(new PrivilegedAction() { public Object run() { try { - String libDir = System.getProperty("java.home") + File.separator + "lib"; -+ final String homeDir = -+ AccessController.doPrivileged( -+ new sun.security.action.GetPropertyAction("java.home")); ++ final String homeDir = new GetPropertyAction("java.home"); + if (homeDir == null) { + throw new Error("java.home is not set"); + } @@ -35,7 +33,7 @@ try (DataInputStream dis = new DataInputStream( new BufferedInputStream(new FileInputStream( new File(libDir, "tzdb.dat"))))) { -@@ -264,6 +276,30 @@ +@@ -264,6 +274,30 @@ } }); }