archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8213406: (fs) More than one instance of built-in FileSystem observed in heap

Browse source 
Reviewed-by: alanb, cushon, weijun
This commit is contained in:
Martin Buchholz 2018-11-28 14:28:28 -08:00
parent 978c78f7fc
commit 7212bf0a77
14 changed files with 106 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/java/io/FilePermission.java
View file

@ -25,7 +25,6 @@
package java.io;
import java.net.URI;
import java.nio.file.*;
import java.security.*;
import java.util.Enumeration;
@ -199,12 +198,11 @@ public final class FilePermission extends Permission implements Serializable {
private static final long serialVersionUID = 7930732926638008763L;
/**
* Always use the internal default file system, in case it was modified
* with java.nio.file.spi.DefaultFileSystemProvider.
* Use the platform's default file system to avoid recursive initialization
* issues when the VM is configured to use a custom file system provider.
*/
private static final java.nio.file.FileSystem builtInFS =
DefaultFileSystemProvider.create()
.getFileSystem(URI.create("file:///"));
DefaultFileSystemProvider.theFileSystem();
private static final Path here = builtInFS.getPath(
GetPropertyAction.privilegedGetProperty("user.dir"));
@ -326,7 +324,7 @@ public final class FilePermission extends Permission implements Serializable {
if (name.equals("<<ALL FILES>>")) {
allFiles = true;
npath = builtInFS.getPath("");
npath = EMPTY_PATH;
// other fields remain default
return;
}
@ -351,7 +349,7 @@ public final class FilePermission extends Permission implements Serializable {
npath = npath.getParent();
}
if (npath == null) {
npath = builtInFS.getPath("");
npath = EMPTY_PATH;
}
invalid = false;
} catch (InvalidPathException ipe) {