cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/modules/input SitemapVariableHolder.java

[cziegeler]

cziegeler    2003/09/05 04:57:06

  Modified:    src/java/org/apache/cocoon/components/modules/input
                        SitemapVariableHolder.java
  Log:
  Prevent NPE when no global variables are defined
  
  Revision  Changes    Path
  1.5       +5 -3      
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java
  
  Index: SitemapVariableHolder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SitemapVariableHolder.java        20 Mar 2003 12:28:45 -0000      1.4
  +++ SitemapVariableHolder.java        5 Sep 2003 11:57:05 -0000       1.5
  @@ -135,8 +135,10 @@
           if ( null == values ) {
               values = new HashMap(this.globalValues);
               ChainedConfiguration conf = this.holder.getConfiguration();
  -            this.prepare(conf, values);
  -            this.holder.setPreparedConfiguration(conf, values);
  +            if ( conf != null ) {
  +                this.prepare(conf, values);
  +                this.holder.setPreparedConfiguration(conf, values);
  +            }
           }
           return values;
       }