src/java.base/linux/classes/sun/nio/fs/DefaultFileSystemProvider.java

8213406: (fs) More than one instance of built-in FileSystem observed in heap
Reviewed-by: alanb, cushon, weijun

@@ -23,21 +23,23 @@
  * questions.
  */
 
 package sun.nio.fs;
 
-import java.nio.file.spi.FileSystemProvider;
+import java.net.URI;
+import java.nio.file.FileSystem;
 
 /**
- * Creates this platform's default FileSystemProvider.
+ * Creates this platform's builtin FileSystemProvider and FileSystem.
  */
 
 public class DefaultFileSystemProvider {
     private DefaultFileSystemProvider() { }
 
-    /**
-     * Returns the default FileSystemProvider.
-     */
-    public static FileSystemProvider create() {
-        return new LinuxFileSystemProvider();
-    }
+    /** The unique instance of the builtin file system provider. */
+    public static final LinuxFileSystemProvider FILE_SYSTEM_PROVIDER
+        = new LinuxFileSystemProvider();
+
+    /** The unique instance of the builtin file system. */
+    public static final FileSystem FILE_SYSTEM
+        = FILE_SYSTEM_PROVIDER.getFileSystem(URI.create("file:///"));
 }