Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java
index e3b4478..83849d9 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/com/c2kernel/scripting/Script.java
@@ -151,7 +151,7 @@ public class Script
         beans.put("storage", Gateway.getStorage());

         beans.put("db", Gateway.getStorage().getDb());

         beans.put("proxy", Gateway.getProxyManager());

-        beans.put("lookup", Gateway.getLDAPLookup());

+        beans.put("lookup", Gateway.getLookup());

         beans.put("orb", Gateway.getORB());

         beans.put("agent", agent);

         beans.put("output", out);

@@ -173,7 +173,7 @@ public class Script
     }

 

     public void setScriptEngine(String lang) throws ScriptingEngineException {

-    	engine = new ScriptEngineManager().getEngineByName(lang);

+    	engine = new ScriptEngineManager(getClass().getClassLoader()).getEngineByName(lang);

     	if (engine==null)

     		throw new ScriptingEngineException("No script engine for '"+lang+"' found.");

     	Bindings beans = engine.createBindings();