From e2f338bdce831004bd2d4894d93ecf6256da59bd Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 27 Mar 2013 03:06:50 +0000 Subject: [PATCH] . Allow users to force the file system provider to be the BSD file system provider. This is helpful when users also wish to force os.name to a different value (e.g. Linux) but not being forced to also use the Linux file system provider. This can be done by defining the property java.nio.file.spi.DefaultFileSystemProvider. This patch differs from the submitters in that the range of values are restricted to the current known defaults. PR: 173847 Submitted by: 4721 at hushmail.com --- ...sses-sun-nio-fs-BsdFileSystemProvider.java | 21 +++++++++++ ...-sun-nio-fs-DefaultFileSystemProvider.java | 37 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java create mode 100644 java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java new file mode 100644 index 000000000000..8897cbe56e30 --- /dev/null +++ b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java @@ -0,0 +1,21 @@ +--- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig ++++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java +@@ -27,6 +27,7 @@ + + import java.nio.file.*; + import java.nio.file.attribute.*; ++import java.nio.file.spi.FileSystemProvider; + import java.io.IOException; + + /** +@@ -38,6 +39,10 @@ + super(); + } + ++ public BsdFileSystemProvider(FileSystemProvider f) { ++ super(); ++ } ++ + @Override + BsdFileSystem newFileSystem(String dir) { + return new BsdFileSystem(this, dir); diff --git a/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java new file mode 100644 index 000000000000..879be08c9206 --- /dev/null +++ b/java/openjdk7/files/patch-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java @@ -0,0 +1,37 @@ +--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Mar 10 14:04:37 2013 -0400 ++++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Mar 26 18:25:51 2013 -0700 +@@ -28,6 +28,8 @@ + import java.nio.file.spi.FileSystemProvider; + import java.security.AccessController; + import java.security.PrivilegedAction; ++import java.util.Set; ++import java.util.HashSet; + import sun.security.action.GetPropertyAction; + + /** +@@ -37,6 +39,14 @@ + public class DefaultFileSystemProvider { + private DefaultFileSystemProvider() { } + ++ private static final Set validFileSystemProviders ++ = new HashSet(); ++ static { ++ validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider"); ++ validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider"); ++ validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider"); ++ } ++ + @SuppressWarnings("unchecked") + private static FileSystemProvider createProvider(final String cn) { + return AccessController +@@ -64,6 +74,10 @@ + public static FileSystemProvider create() { + String osname = AccessController + .doPrivileged(new GetPropertyAction("os.name")); ++ String fileSystemProvider = System ++ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); ++ if (validFileSystemProviders.contains(fileSystemProvider)) ++ return createProvider(fileSystemProvider); + if (osname.equals("SunOS")) + return createProvider("sun.nio.fs.SolarisFileSystemProvider"); + if (osname.equals("Linux"))