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

Merged DEV/TEMPORARY to HEAD

Browse Source 
17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-12-14 13:41:05 +00:00
parent eaacdeb2ed
commit b726c4d6db
470 changed files with 572 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,15 +305,7 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
{
// load from classpath
String scriptClasspath = resource.substring(PATH_CLASSPATH.length());
InputStream stream;
if (logger.isDebugEnabled())
{
stream = getClass().getClassLoader().getResource(scriptClasspath).openStream();
}
else
{
stream = getClass().getClassLoader().getResourceAsStream(scriptClasspath);
}
InputStream stream = getClass().getClassLoader().getResource(scriptClasspath).openStream();
if (stream == null)
{
throw new AlfrescoRuntimeException("Unable to load included script classpath resource: " + resource);