avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel DefaultKernel.java
Date Fri, 29 Nov 2002 15:12:34 GMT
mcconnell    2002/11/29 07:12:34

  Modified:    assembly/src/java/org/apache/excalibur/merlin/kernel
                        DefaultKernel.java
  Log:
  Patch from Vinay Chandran to correct logging test for null logg in fail condition.
  
  Revision  Changes    Path
  1.60      +6 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- DefaultKernel.java	18 Nov 2002 10:52:53 -0000	1.59
  +++ DefaultKernel.java	29 Nov 2002 15:12:33 -0000	1.60
  @@ -486,7 +486,11 @@
           catch( Throwable e )
           {
               final String error = "kernel initialization failure";
  -            getLogger().error( ExceptionHelper.packException( error, e ) );
  +            if( getLogger() != null )
  +            {
  +                getLogger().error( 
  +                  ExceptionHelper.packException( error, e ) );
  +            }
               throw new KernelException( error );
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message