svn commit: r1702951 - in /sling/trunk/bundles/scripting/javascript/src: main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java

[radu]

Author: radu
Date: Mon Sep 14 13:37:55 2015
New Revision: 1702951

URL: http://svn.apache.org/r1702951
Log:
SLING-5022 - ImporterTopLevel is not set up correctly for the 
RhinoJavaScriptEngine

* made sure the ImporterTopLevel is initialised with the global context

Modified:
    
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
    
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java

Modified: 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java?rev=1702951&r1=1702950&r2=1702951&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
 (original)
+++ 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
 Mon Sep 14 13:37:55 2015
@@ -248,7 +248,7 @@ public class RhinoJavaScriptEngine exten
                 } else {
                     // create the request top scope, use the ImporterToplevel 
here
                     // to support the importPackage and importClasses functions
-                    scope = new ImporterTopLevel();
+                    scope = new ImporterTopLevel(rhinoContext);
 
                     // Set the global scope to be our prototype
                     scope.setPrototype(rootScope);

Modified: 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java?rev=1702951&r1=1702950&r2=1702951&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
 (original)
+++ 
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
 Mon Sep 14 13:37:55 2015
@@ -332,11 +332,6 @@ public class ScriptableNodeTest extends
 
         String code = "node['singleRef']";
         assertTrue(script.eval(code, data) instanceof Node);
-        code = "node.singleRef instanceof Array";
-        assertEquals(false, script.eval(code, data));
-
-        code = "node.multiRef instanceof Array";
-        assertEquals(true, script.eval(code, data));
 
         code = "node.multiRef[0]";
         assertTrue(script.eval(code, data) instanceof Node);