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

[cziegeler]

cziegeler    2003/10/20 01:42:45

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Fixing NPE
  
  Revision  Changes    Path
  1.19      +6 -3      
cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CocoonServlet.java        20 Oct 2003 08:15:27 -0000      1.18
  +++ CocoonServlet.java        20 Oct 2003 08:42:45 -0000      1.19
  @@ -1353,8 +1353,11 @@
               ContainerUtil.enableLogging(c, this.getCocoonLogger());
               c.setLoggerManager( getLoggerManager() );
               ContainerUtil.contextualize(c, this.appContext);
  -            ContainerUtil.compose(c, getParentComponentManager());
  -            ContainerUtil.service(c, this.getParentComponentManager());
  +            final ComponentManager parent = this.getParentComponentManager();
  +            if ( parent != null ) {
  +                ContainerUtil.compose(c, getParentComponentManager());
  +                ContainerUtil.service(c, this.getParentComponentManager());
  +            }
               if (this.enableInstrumentation) {
                   c.setInstrumentManager(getInstrumentManager());
               }