From 25d51202e0f97bd0eff1eed6fdb14378fb1e7fd6 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 10 Sep 2007 12:40:59 +0000
Subject: [PATCH] Merged V2.1 to HEAD    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
---
 .../repo/jscript/RhinoScriptProcessor.java    | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
index de7fda818c..47daaca213 100644
--- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
+++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
@@ -51,10 +51,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.apache.log4j.Logger;
 import org.mozilla.javascript.Context;
-import org.mozilla.javascript.NativeArray;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.Wrapper;
 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)
     {
-        Map<String, Object> newModel = new HashMap<String, Object>(model.size());
-        for (Map.Entry<String, Object> entry : model.entrySet())
-        {
-            if (entry.getValue() instanceof NodeRef)
-            {
-                newModel.put(entry.getKey(), new ScriptNode((NodeRef)entry.getValue(), this.services));
-            }
-            else
-            {
-                newModel.put(entry.getKey(), entry.getValue());
-            }
-        }
+    	Map<String, Object> newModel = null;
+    	if (model != null)
+    	{
+	        newModel = new HashMap<String, Object>(model.size());
+	        for (Map.Entry<String, Object> entry : model.entrySet())
+	        {
+	            if (entry.getValue() instanceof NodeRef)
+	            {
+	                newModel.put(entry.getKey(), new ScriptNode((NodeRef)entry.getValue(), this.services));
+	            }
+	            else
+	            {
+	                newModel.put(entry.getKey(), entry.getValue());
+	            }
+	        }
+    	}
+    	else
+    	{
+    		newModel = new HashMap<String, Object>(0);
+    	}
         return newModel;
     }