Merge pull request #597 from pshipton/u345-0.33

Merge jdk8u345-b01 to 0.33

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk8u
 jbs=JDK
-version=openjdk8u342
+version=openjdk8u345
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk8u342-b07
+OPENJDK_TAG := jdk8u345-b01

common/autoconf/version-numbers

@@ -26,7 +26,7 @@
 JDK_MAJOR_VERSION=1
 JDK_MINOR_VERSION=8
 JDK_MICRO_VERSION=0
-JDK_UPDATE_VERSION=342
+JDK_UPDATE_VERSION=345
 LAUNCHER_NAME=openjdk
 PRODUCT_NAME=OpenJDK
 PRODUCT_SUFFIX="Runtime Environment"

jdk/make/closed/autoconf/openj9ext-version-numbers

@@ -23,5 +23,5 @@
 COMPANY_NAME="Eclipse OpenJ9"
 VENDOR_URL="http://www.eclipse.org/openj9"
 
-JDK_MOD_VERSION=342
+JDK_MOD_VERSION=345
 JDK_FIX_VERSION=0

jdk/src/solaris/classes/java/io/UnixFileSystem.java

@@ -34,7 +34,6 @@ class UnixFileSystem extends FileSystem {
     private final char slash;
     private final char colon;
     private final String javaHome;
-    private final String userDir;
 
     public UnixFileSystem() {
         slash = AccessController.doPrivileged(
@@ -43,8 +42,6 @@ public UnixFileSystem() {
             new GetPropertyAction("path.separator")).charAt(0);
         javaHome = AccessController.doPrivileged(
             new GetPropertyAction("java.home"));
-        userDir = AccessController.doPrivileged(
-            new GetPropertyAction("user.dir"));
     }
 
 
@@ -138,11 +135,7 @@ public boolean isInvalid(File f) {
 
     public String resolve(File f) {
         if (isAbsolute(f)) return f.getPath();
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertyAccess("user.dir");
-        }
-        return resolve(userDir, f.getPath());
+        return resolve(System.getProperty("user.dir"), f.getPath());
     }
 
     // Caches for canonicalization results to improve startup performance.

jdk/src/windows/classes/java/io/WinNTFileSystem.java

@@ -53,7 +53,6 @@ class WinNTFileSystem extends FileSystem {
     private final char slash;
     private final char altSlash;
     private final char semicolon;
-    private final String userDir;
 
     // Whether to enable alternative data streams (ADS) by suppressing
     // checking the path for invalid characters, in particular ":".
@@ -75,8 +74,6 @@ public WinNTFileSystem() {
         semicolon = AccessController.doPrivileged(
             new GetPropertyAction("path.separator")).charAt(0);
         altSlash = (this.slash == '\\') ? '/' : '\\';
-        userDir = AccessController.doPrivileged(
-            new GetPropertyAction("user.dir"));
     }
 
     private boolean isSlash(char c) {
@@ -403,11 +400,7 @@ public String resolve(File f) {
     private String getUserPath() {
         /* For both compatibility and security,
            we must look this up every time */
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertyAccess("user.dir");
-        }
-        return normalize(userDir);
+        return normalize(System.getProperty("user.dir"));
     }
 
     private String getDrive(String path) {