Merged V3.2 to HEAD

19216: ENH-506 - allow script compilation to be disabled for repository tier. Fix to unreported issue with return aspect array from a ScriptNode.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-03-11 12:31:51 +00:00
parent 2608d6b43e
commit 66bbd4339a

View File

@@ -101,14 +101,14 @@ public class RepositoryScriptProcessor implements ScriptProcessor
{ {
return scriptService.executeScript("javascript", new RepositoryScriptLocation(content), model); return scriptService.executeScript("javascript", new RepositoryScriptLocation(content), model);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.web.scripts.ScriptProcessor#unwrapValue(java.lang.Object) * @see org.alfresco.web.scripts.ScriptProcessor#unwrapValue(java.lang.Object)
*/ */
public Object unwrapValue(Object value) public Object unwrapValue(Object value)
{ {
return valueConverter.convertValueForJava(value); return valueConverter.convertValueForJava(value);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.web.scripts.ScriptProcessor#reset() * @see org.alfresco.web.scripts.ScriptProcessor#reset()