Fridrich Strba 2017-09-30 19:34:48 +00:00 committed by Git OBS Bridge
parent 8e22767a97
commit 774f492999

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-30 21:18:06.562932697 +0200
+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2017-09-30 21:28:03.040474683 +0200
@@ -31,6 +31,7 @@
import java.io.DataInputStream;
import java.io.File;
@ -21,7 +21,7 @@
public Object run() {
try {
- String libDir = System.getProperty("java.home") + File.separator + "lib";
+ final String homeDir = new GetPropertyAction("java.home");
+ final String homeDir = System.getProperty("java.home");
+ if (homeDir == null) {
+ throw new Error("java.home is not set");
+ }