rpm/java-1_8_0-openjdk
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openjdk
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=257

Browse Source
This commit is contained in:
Fridrich Strba 2017-09-30 19:19:27 +00:00 committed by Git OBS Bridge
parent 9d4b66822d
commit 8e22767a97
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alternative-tzdb_dat.patch
View File

@ -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<Object>() {
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 @@
}
});
}