changeset 4674:e0ae4a493ef4

Merge
author asaha
date Fri, 01 Jul 2011 16:15:52 -0700
parents 378152969a89 (current diff) d43c73bafe01 (diff)
children a904aa0c232c
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jul 01 16:15:09 2011 -0700
+++ b/.hgtags	Fri Jul 01 16:15:52 2011 -0700
@@ -121,3 +121,5 @@
 23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
+69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
+f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
--- a/src/windows/classes/java/lang/ProcessImpl.java	Fri Jul 01 16:15:09 2011 -0700
+++ b/src/windows/classes/java/lang/ProcessImpl.java	Fri Jul 01 16:15:52 2011 -0700
@@ -60,10 +60,11 @@
         throws IOException
     {
         if (append) {
+            String path = f.getPath();
             SecurityManager sm = System.getSecurityManager();
             if (sm != null)
-                sm.checkWrite(f.getPath());
-            long handle = openForAtomicAppend(f.getPath());
+                sm.checkWrite(path);
+            long handle = openForAtomicAppend(path);
             final FileDescriptor fd = new FileDescriptor();
             fdAccess.setHandle(fd, handle);
             return AccessController.doPrivileged(