SLING-9159 - Switch to the LazyBindings implementation from org.apache.sling.api
* switched to LazyBindings in all classes
diff --git a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
index 311eeae..43c5fde 100644
--- a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptContext.java
@@ -24,18 +24,18 @@
import java.util.List;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
import javax.script.SimpleScriptContext;
+import org.apache.sling.api.scripting.LazyBindings;
import org.apache.sling.api.scripting.SlingScriptConstants;
class BundledScriptContext extends SimpleScriptContext {
private static final Integer[] SCOPES = {SlingScriptConstants.SLING_SCOPE, GLOBAL_SCOPE, ENGINE_SCOPE};
- private Bindings globalScope = new SimpleBindings();
- private Bindings engineScope = new SimpleBindings();
- private Bindings slingScope = new SimpleBindings();
+ private Bindings globalScope = new LazyBindings();
+ private Bindings engineScope = new LazyBindings();
+ private Bindings slingScope = new LazyBindings();
@Override
public void setBindings(final Bindings bindings, final int scope) {
diff --git a/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
index 5607669..caee87e 100644
--- a/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/ScriptContextProvider.java
@@ -31,7 +31,6 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -83,7 +82,7 @@
executable.getScriptEngineName(), executable.getPath()));
}
// prepare the SlingBindings
- Bindings bindings = new SimpleBindings();
+ Bindings bindings = new LazyBindings();
bindings.put("properties", request.getResource().getValueMap());
bindings.put(SlingBindings.REQUEST, request);
bindings.put(SlingBindings.RESPONSE, response);
