# HG changeset patch
# User minqi
# Date 1519251825 28800
# Node ID 847a988152b87e88d78e5fcadc13f2abc11de171
# Parent  02404e27d356151c76bc7819cd5083d0360b1f3f
8194154: System property user.dir should not be changed
Summary: Cached user.dir so getCanonicalPath uses the cached value.
Reviewed-by: alanb, bpb, rriggs

diff -r 02404e27d356 -r 847a988152b8 src/java.base/unix/classes/java/io/UnixFileSystem.java
--- a/src/java.base/unix/classes/java/io/UnixFileSystem.java	Wed Feb 21 00:29:04 2018 -0500
+++ b/src/java.base/unix/classes/java/io/UnixFileSystem.java	Wed Feb 21 14:23:45 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,14 @@
     private final char slash;
     private final char colon;
     private final String javaHome;
+    private final String userDir;
 
     public UnixFileSystem() {
         Properties props = GetPropertyAction.privilegedGetProperties();
         slash = props.getProperty("file.separator").charAt(0);
         colon = props.getProperty("path.separator").charAt(0);
         javaHome = props.getProperty("java.home");
+        userDir = props.getProperty("user.dir");
     }
 
 
@@ -128,7 +130,11 @@
 
     public String resolve(File f) {
         if (isAbsolute(f)) return f.getPath();
-        return resolve(System.getProperty("user.dir"), f.getPath());
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPropertyAccess("user.dir");
+        }
+        return resolve(userDir, f.getPath());
     }
 
     // Caches for canonicalization results to improve startup performance.
diff -r 02404e27d356 -r 847a988152b8 src/java.base/windows/classes/java/io/WinNTFileSystem.java
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java	Wed Feb 21 00:29:04 2018 -0500
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java	Wed Feb 21 14:23:45 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,12 +43,14 @@
     private final char slash;
     private final char altSlash;
     private final char semicolon;
+    private final String userDir;
 
     public WinNTFileSystem() {
         Properties props = GetPropertyAction.privilegedGetProperties();
         slash = props.getProperty("file.separator").charAt(0);
         semicolon = props.getProperty("path.separator").charAt(0);
         altSlash = (this.slash == '\\') ? '/' : '\\';
+        userDir = props.getProperty("user.dir");
     }
 
     private boolean isSlash(char c) {
@@ -347,7 +349,11 @@
     private String getUserPath() {
         /* For both compatibility and security,
            we must look this up every time */
-        return normalize(System.getProperty("user.dir"));
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPropertyAccess("user.dir");
+        }
+        return normalize(userDir);
     }
 
     private String getDrive(String path) {
diff -r 02404e27d356 -r 847a988152b8 test/jdk/java/io/File/UserDirChangedTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/io/File/UserDirChangedTest.java	Wed Feb 21 14:23:45 2018 -0800
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 8194154
+   @summary Test changing property user.dir on impacting getCanonicalPath
+   @run main/othervm UserDirChangedTest
+ */
+
+import java.io.File;
+
+public class UserDirChangedTest {
+    public static void main(String[] args) throws Exception {
+        String keyUserDir = "user.dir";
+        String userDirNew = "/home/a/b/c/";
+        String fileName = "./a";
+
+        String userDir = System.getProperty(keyUserDir);
+        File file = new File(fileName);
+        String canFilePath = file.getCanonicalPath();
+
+        // now reset user.dir, this will cause crash on linux without bug 8194154 fixed.
+        System.setProperty(keyUserDir,  userDirNew);
+        String newCanFilePath = file.getCanonicalPath();
+        System.out.format("%24s %48s%n", "Canonical Path = ", canFilePath);
+        System.out.format("%24s %48s%n", "new Canonical Path = ", newCanFilePath);
+        if (!canFilePath.equals(newCanFilePath)) {
+            throw new RuntimeException("Changing property user.dir should have no effect on getCanonicalPath");
+        }
+    }
+}