cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/resource ResourceManager.java

[geirm]

geirm       01/04/30 04:02:20

  Modified:    src/java/org/apache/velocity/runtime/resource
                        ResourceManager.java
  Log:
  Little protective fix in case a loader doesn't behave.
  
  Revision  Changes    Path
  1.26      +6 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java
  
  Index: ResourceManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ResourceManager.java      2001/04/27 15:23:40     1.25
  +++ ResourceManager.java      2001/04/30 11:02:19     1.26
  @@ -81,7 +81,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Paulo Gaspar</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
  - * @version $Id: ResourceManager.java,v 1.25 2001/04/27 15:23:40 geirm Exp $
  + * @version $Id: ResourceManager.java,v 1.26 2001/04/30 11:02:19 geirm Exp $
    */
   public class ResourceManager
   {
  @@ -482,7 +482,11 @@
               try
               {
                   is=resourceLoader.getResourceStream( resourceName );
  -                return resourceLoader.getClass().toString();
  +               
  +                if( is != null)
  +                {
  +                    return resourceLoader.getClass().toString();
  +                }
               }
               catch( ResourceNotFoundException e)
               {