cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java

[cziegeler]

cziegeler    2003/10/20 01:41:26

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Fixing NPE
  
  Revision  Changes    Path
  1.18      +5 -2      
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- CocoonServlet.java        19 Oct 2003 17:53:03 -0000      1.17
  +++ CocoonServlet.java        20 Oct 2003 08:41:26 -0000      1.18
  @@ -1352,7 +1352,10 @@
               ContainerUtil.enableLogging(c, getCocoonLogger() );
               c.setLoggerManager( getLoggerManager() );
               ContainerUtil.contextualize(c, this.appContext);
  -            ContainerUtil.compose(c, getParentComponentManager());
  +            final ComponentManager parent = this.getParentComponentManager();
  +            if ( parent != null ) {
  +                ContainerUtil.compose(c, parent);
  +            }
               if (this.enableInstrumentation) {
                   c.setInstrumentManager(getInstrumentManager());
               }