cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation TraversableGenerator.java

[unico]

unico       2004/03/25 05:21:14

  Modified:    src/blocks/repository/java/org/apache/cocoon/generation
                        TraversableGenerator.java
  Log:
  prevent NPE
  
  Revision  Changes    Path
  1.12      +9 -5      
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
  
  Index: TraversableGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TraversableGenerator.java 22 Mar 2004 13:49:04 -0000      1.11
  +++ TraversableGenerator.java 25 Mar 2004 13:21:14 -0000      1.12
  @@ -316,10 +316,14 @@
               throw new ResourceNotFoundException("Could not read collection "
                                                   + this.source, ioe);
           } finally {
  -            this.resolver.release(src);
  -            Enumeration enum = ancestors.elements();
  -            while (enum.hasMoreElements()) {
  -                resolver.release((Source) enum.nextElement());
  +            if (src != null) {
  +                this.resolver.release(src);
  +            }
  +            if (ancestors != null) {
  +                Enumeration enum = ancestors.elements();
  +                while (enum.hasMoreElements()) {
  +                    resolver.release((Source) enum.nextElement());
  +                }
               }
           }
       }