blob: 44558c8f68906698fa07dd84e4d1fab5dfe5e42c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
$NetBSD: patch-al,v 1.4 2013/06/15 09:31:05 jperkin Exp $
DragonFly support.
--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2013-06-01 14:10:31.000000000 +0000
+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
@@ -28,6 +28,8 @@ package sun.nio.fs;
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 @@ import sun.security.action.GetPropertyAc
public class DefaultFileSystemProvider {
private DefaultFileSystemProvider() { }
+ private static final Set<String> validFileSystemProviders
+ = new HashSet<String>();
+ 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,11 +74,15 @@ public class DefaultFileSystemProvider {
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"))
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
- if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X"))
+ if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X") || osname.equals("DragonFly"))
return createProvider("sun.nio.fs.BsdFileSystemProvider");
throw new AssertionError("Platform not recognized");
}
|
