Author: wglass
Date: Wed Jan 5 06:26:48 2005
New Revision: 124212
URL: http://svn.apache.org/viewcvs?view=rev&rev=124212
Log:
ClasspathResourceLoader was using wrong ClassLoader. Long discussion here.
http://issues.apache.org/bugzilla/show_bug.cgi?id=22419
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?view=diff&rev=124212&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java&r1=124211&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java&r2=124212
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java Wed Jan 5 06:26:48 2005
@@ -67,7 +67,7 @@
* work just fine.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ClasspathResourceLoader.java,v 1.10 2004/03/19 17:13:37 dlr Exp $
+ * @version $Id$
*/
public class ClasspathResourceLoader extends ResourceLoader
{
@@ -102,8 +102,18 @@
try
{
- ClassLoader classLoader = this.getClass().getClassLoader();
- result= classLoader.getResourceAsStream( name );
+ ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+ if (classLoader == null) {
+ classLoader = this.getClass().getClassLoader();
+ result = classLoader.getResourceAsStream( name );
+ } else {
+ result= classLoader.getResourceAsStream( name );
+ if (result == null) {
+ classLoader = this.getClass().getClassLoader();
+ result = classLoader.getResourceAsStream( name );
+ }
+ }
}
catch( Exception fnfe )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org