inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6308: Various RM bug fixes
   6343: Minor config cleanup for RM bootstrap
            Conflict resolved


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:40:59 +00:00
parent 9b1f563ebf
commit 25d51202e0
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
View File

@@ -51,10 +51,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeArray;
import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.Wrapper;
import org.springframework.util.FileCopyUtils; import org.springframework.util.FileCopyUtils;
/** /**
@@ -538,18 +536,26 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
*/ */
private Map<String, Object> convertToRhinoModel(Map<String, Object> model) private Map<String, Object> convertToRhinoModel(Map<String, Object> model)
{ {
Map<String, Object> newModel = new HashMap<String, Object>(model.size()); Map<String, Object> newModel = null;
for (Map.Entry<String, Object> entry : model.entrySet()) if (model != null)
{ {
if (entry.getValue() instanceof NodeRef) newModel = new HashMap<String, Object>(model.size());
{ for (Map.Entry<String, Object> entry : model.entrySet())
newModel.put(entry.getKey(), new ScriptNode((NodeRef)entry.getValue(), this.services)); {
} if (entry.getValue() instanceof NodeRef)
else {
{ newModel.put(entry.getKey(), new ScriptNode((NodeRef)entry.getValue(), this.services));
newModel.put(entry.getKey(), entry.getValue()); }
} else
} {
newModel.put(entry.getKey(), entry.getValue());
}
}
}
else
{
newModel = new HashMap<String, Object>(0);
}
return newModel; return newModel;
} }