From a5859015a8286e5e47720cde78875f4dec7d8014 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Fri, 19 Aug 2016 16:29:41 +0900
Subject: [PATCH] 8164326: jrtfsviewer.js and jrtls.js does not work

Reviewed-by: sherman, sundar
---
 .../java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js  | 3 ++-
 jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js
index c86514a7166..0d7377a45d2 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js
+++ b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtfsviewer.js
@@ -53,6 +53,7 @@ var FileSystems = Java.type("java.nio.file.FileSystems");
 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 @@ function getJrtFileSystem() {
             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);
     }
 }
 
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js
index ed96f89b30b..d5e92f29741 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js
+++ b/jdk/src/java.base/share/classes/jdk/internal/jrtfs/jrtls.js
@@ -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");