You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/04/30 13:03:15 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader JarResourceLoader.java
geirm 01/04/30 04:03:15
Modified: src/java/org/apache/velocity/runtime/resource/loader
JarResourceLoader.java
Log:
Make sure that the ResourceNotFound is thrown when a resource isn't found,
rather than returning null.
Revision Changes Path
1.9 +5 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Index: JarResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JarResourceLoader.java 2001/03/23 04:18:50 1.8
+++ JarResourceLoader.java 2001/04/30 11:03:14 1.9
@@ -80,7 +80,7 @@
* ResourceLoader to load templates from multiple Jar files.
*
* @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
- * @version $Id: JarResourceLoader.java,v 1.8 2001/03/23 04:18:50 jvanzyl Exp $
+ * @version $Id: JarResourceLoader.java,v 1.9 2001/04/30 11:03:14 geirm Exp $
*/
public class JarResourceLoader extends ResourceLoader
{
@@ -214,10 +214,13 @@
{
JarHolder holder = (JarHolder)jarfiles.get( jarurl );
results = holder.getResource( normalizedPath );
+ return results;
}
}
- return results;
+ throw new ResourceNotFoundException( "JarResourceLoader Error: cannot find resource " +
+ source );
+
}