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

Merge Web Scripts from BRANCHES/DEV/DAVE

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-03-08 14:47:01 +00:00
parent f17fd30824
commit a3ae1fc827
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/importer/FileImporterImpl.java
View File

@@ -168,7 +168,7 @@ public class FileImporterImpl implements FileImporter
final File file, final File file,
FileFilter filter, FileFilter filter,
boolean recurse, boolean recurse,
final String containerName) throws Exception final String containerName) throws Throwable
{ {
if (containerName != null) if (containerName != null)
{ {

8
source/java/org/alfresco/repo/jscript/RhinoScriptService.java
View File

@@ -30,6 +30,8 @@ import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -48,6 +50,8 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.EvaluatorException;
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.mozilla.javascript.Wrapper;
@@ -303,6 +307,10 @@ public class RhinoScriptService implements ScriptService
{ {
result = ((Wrapper)result).unwrap(); result = ((Wrapper)result).unwrap();
} }
else if (result instanceof NativeArray)
{
result = Context.jsToJava(result, Object[].class);
}
return result; return result;
} }

2
source/java/org/alfresco/repo/transaction/TransactionUtil.java
View File

@@ -56,7 +56,7 @@ public class TransactionUtil
* *
* @return Return the result of the operation * @return Return the result of the operation
*/ */
Result doWork() throws Exception; Result doWork() throws Throwable;
} }
/** /**