--- a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js	Fri Aug 19 06:27:54 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js	Fri Aug 19 16:29:41 2016 +0900
@@ -53,6 +53,7 @@
 var Files = Java.type("java.nio.file.Files");
 var System = Java.type("java.lang.System");
 var URI = Java.type("java.net.URI");
+var Collections = Java.type("java.util.Collections");
 
 // JavaFX classes used
 var StackPane = Java.type("javafx.scene.layout.StackPane");
@@ -100,7 +101,7 @@
             print("did you miss specifying jrt-fs.jar with -cp option?");
             usage();
         }
-        return FileSystems.newFileSystem(uri, null, cls.classLoader);
+        return FileSystems.newFileSystem(uri, Collections.emptyMap(), cls.classLoader);
     }
 }
 

--- a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js	Fri Aug 19 06:27:54 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js	Fri Aug 19 16:29:41 2016 +0900
@@ -34,7 +34,6 @@
  * but also compiled and delivered as part of the jrtfs.jar to support access
  * to the jimage file provided by the shipped JDK by tools running on JDK 8.
  */
- */
 
 // classes used
 var Files = Java.type("java.nio.file.Files");