# HG changeset patch
# User michaelm
# Date 1513699975 0
# Node ID 4ffa14468cd142c58e7c3c6d20115d1001206934
# Parent  41ae5c69b09c670cbd03872bbf1efb52c0bd78e6# Parent  5471388067cf662b8894b80902bc2929cefd3f54
Merge

diff -r 41ae5c69b09c -r 4ffa14468cd1 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js	Tue Dec 19 15:48:49 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js	Tue Dec 19 16:12:55 2017 +0000
@@ -4,7 +4,9 @@
  *
  * 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.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff -r 41ae5c69b09c -r 4ffa14468cd1 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js	Tue Dec 19 15:48:49 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js	Tue Dec 19 16:12:55 2017 +0000
@@ -4,7 +4,9 @@
  *
  * 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.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff -r 41ae5c69b09c -r 4ffa14468cd1 test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED
--- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED	Tue Dec 19 15:48:49 2017 +0000
+++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED	Tue Dec 19 16:12:55 2017 +0000
@@ -1,12 +1,12 @@
 class jdk.nashorn.javaadapters.javax_script_ScriptContext
-TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39
+TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41
 class jdk.nashorn.javaadapters.java_util_ArrayList
 class jdk.nashorn.javaadapters.java_util_ArrayList
 [JavaClass java.lang.Integer]
-TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16
+TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16
 [JavaClass java.util.HashSet]
 [JavaClass java.util.HashSet]
 [JavaClass java.lang.Integer]
-ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67
+ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69
 [JavaClass java.util.HashMap]
 [JavaClass java.util.HashMap]