changeset 464:e4efb3ce97b2

8021246: Fix regression for 8021189 Reviewed-by: lagergren, sundar
author attila
date Wed, 24 Jul 2013 12:48:09 +0200
parents a58a07a00122
children 2a25917777f7
files src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java test/script/trusted/JDK-8006529.js
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java	Wed Jul 24 11:13:24 2013 +0200
+++ b/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java	Wed Jul 24 12:48:09 2013 +0200
@@ -165,7 +165,7 @@
 
     // Package used when the adapter can't be defined in the adaptee's package (either because it's sealed, or because
     // it's a java.* package.
-    private static final String ADAPTER_PACKAGE_PREFIX = "jdk/nashorn/internal/javaadapters/";
+    private static final String ADAPTER_PACKAGE_PREFIX = "jdk/nashorn/javaadapters/";
     // Class name suffix used to append to the adaptee class name, when it can be defined in the adaptee's package.
     private static final String ADAPTER_CLASS_NAME_SUFFIX = "$$NashornJavaAdapter";
     private static final String JAVA_PACKAGE_PREFIX = "java/";
--- a/test/script/trusted/JDK-8006529.js	Wed Jul 24 11:13:24 2013 +0200
+++ b/test/script/trusted/JDK-8006529.js	Wed Jul 24 12:48:09 2013 +0200
@@ -124,7 +124,7 @@
 
     var env = getEnvMethod.invoke(getContextMethod.invoke(null))
 
-    var parser   = ParserConstructor.newInstance(env, source, new ThrowErrorManager());
+    var parser   = ParserConstructor.newInstance(env, source, ThrowErrorManager.class.newInstance());
     var func     = parseMethod.invoke(parser);
 
     var compiler = CompilerConstructor.newInstance(env);