diff --git a/source/java/org/alfresco/repo/importer/FileImporterImpl.java b/source/java/org/alfresco/repo/importer/FileImporterImpl.java index 26cdb8ef52..9b56919b24 100644 --- a/source/java/org/alfresco/repo/importer/FileImporterImpl.java +++ b/source/java/org/alfresco/repo/importer/FileImporterImpl.java @@ -168,7 +168,7 @@ public class FileImporterImpl implements FileImporter final File file, FileFilter filter, boolean recurse, - final String containerName) throws Exception + final String containerName) throws Throwable { if (containerName != null) { diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java index 5cc27a4aeb..74982a29b4 100644 --- a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java +++ b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java @@ -30,6 +30,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -48,6 +50,8 @@ import org.alfresco.service.namespace.QName; import org.alfresco.util.ParameterCheck; import org.apache.log4j.Logger; import org.mozilla.javascript.Context; +import org.mozilla.javascript.EvaluatorException; +import org.mozilla.javascript.NativeArray; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.Wrapper; @@ -303,6 +307,10 @@ public class RhinoScriptService implements ScriptService { result = ((Wrapper)result).unwrap(); } + else if (result instanceof NativeArray) + { + result = Context.jsToJava(result, Object[].class); + } return result; } diff --git a/source/java/org/alfresco/repo/transaction/TransactionUtil.java b/source/java/org/alfresco/repo/transaction/TransactionUtil.java index 4c1be7095a..f0c6f512a6 100644 --- a/source/java/org/alfresco/repo/transaction/TransactionUtil.java +++ b/source/java/org/alfresco/repo/transaction/TransactionUtil.java @@ -56,7 +56,7 @@ public class TransactionUtil * * @return Return the result of the operation */ - Result doWork() throws Exception; + Result doWork() throws Throwable; } /**