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

Merged V3.0 to HEAD

Browse Source 
12200: Fix for ETHREEOH-974
       - Large file uploads now correctly streamed through web-tier (replaced Sun HTTPClient impl with Apache impl that fully supports streaming of multi-part form content).
       - Fix to repository WebScripts framework to not load multi-part form file content into memory (i.e. to fix repo side)
       - Improvements to web-tier script execution performance as per CHK-5509 and some recent research into runtime compiling of Rhino scripts.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-01-05 11:38:51 +00:00
parent d09673969d
commit 521bd63b57
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,10 +73,10 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
private static final String PATH_CLASSPATH = "classpath:"; private static final String PATH_CLASSPATH = "classpath:";
/** Wrap Factory */ /** Wrap Factory */
private static WrapFactory wrapFactory = new RhinoWrapFactory(); private static final WrapFactory wrapFactory = new RhinoWrapFactory();
/** Base Value Converter */ /** Base Value Converter */
private ValueConverter valueConverter = new ValueConverter(); private final ValueConverter valueConverter = new ValueConverter();
/** Store into which to resolve cm:name based script paths */ /** Store into which to resolve cm:name based script paths */
private StoreRef storeRef; private StoreRef storeRef;
@@ -348,7 +348,8 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
Context cx = Context.enter(); Context cx = Context.enter();
try try
{ {
// Create a thread-specific scope from one of the shared scopes. See http://www.mozilla.org/rhino/scopes.html // Create a thread-specific scope from one of the shared scopes.
// See http://www.mozilla.org/rhino/scopes.html
cx.setWrapFactory(wrapFactory); cx.setWrapFactory(wrapFactory);
Scriptable sharedScope = secure ? this.nonSecureScope : this.secureScope; Scriptable sharedScope = secure ? this.nonSecureScope : this.secureScope;
Scriptable scope = cx.newObject(sharedScope); Scriptable scope = cx.newObject(sharedScope);
@@ -469,8 +470,8 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
/** /**
* Pre initializes two scope objects (one secure and one not) with the standard objects preinitialised. This saves * Pre initializes two scope objects (one secure and one not) with the standard objects preinitialised.
* on very expensive calls to reinitialize a new scope on every web script execution. See * This saves on very expensive calls to reinitialize a new scope on every web script execution. See
* http://www.mozilla.org/rhino/scopes.html * http://www.mozilla.org/rhino/scopes.html
* *
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
@@ -505,7 +506,6 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
// allow access to all libraries and objects, including the importer // allow access to all libraries and objects, including the importer
// @see http://www.mozilla.org/rhino/ScriptingJava.html // @see http://www.mozilla.org/rhino/ScriptingJava.html
this.nonSecureScope = new ImporterTopLevel(cx); this.nonSecureScope = new ImporterTopLevel(cx);
} }
finally finally
{ {