From ae7c03d291edb16d7aa02035f79e52c1366b8004 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 19 Dec 2006 16:47:27 +0000 Subject: [PATCH] Merged 1.4 to HEAD (Repo changes associated with Records Management) svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4227 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4228 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4242 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4243 . svn resolved source\java\org\alfresco\repo\jscript\RhinoScriptService.java svn resolved config\alfresco\script-services-context.xml git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/jscript/RhinoScriptService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java index 81a4b5934d..a0debb0b6f 100644 --- a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java +++ b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java @@ -34,6 +34,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.ScriptException; import org.alfresco.service.cmr.repository.ScriptImplementation; import org.alfresco.service.cmr.repository.ScriptLocation; +import org.alfresco.service.cmr.repository.ScriptImplementation; import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.namespace.QName; @@ -267,7 +268,7 @@ public class RhinoScriptService implements ScriptService for (ScriptImplementation script : this.globalScripts) { model.put(script.getScriptName(), script); - } + } // insert supplied object model into root of the default scope for (String key : model.keySet())