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

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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -23,16 +23,31 @@
  * questions.
  */
 
 package sun.nio.fs;
 
-import java.nio.file.spi.FileSystemProvider;
+import java.nio.file.FileSystem;
 
 /**
- * Creates default provider on Windows
+ * Creates this platform's system-default ("builtin") FileSystemProvider.
  */
+
 public class DefaultFileSystemProvider {
+    private static final WindowsFileSystemProvider INSTANCE
+        = new WindowsFileSystemProvider();
+
     private DefaultFileSystemProvider() { }
-    public static FileSystemProvider create() {
-        return new WindowsFileSystemProvider();
+
+    /**
+     * Returns the platform's system-default file system provider.
+     */
+    public static WindowsFileSystemProvider instance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Returns the platform's system-default file system.
+     */
+    public static FileSystem theFileSystem() {
+        return INSTANCE.theFileSystem();
     }
 }