avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress DefaultContainerManager.java
Date Wed, 07 Aug 2002 13:12:24 GMT
bloritsch    2002/08/07 06:12:24

  Modified:    fortress/src/java/org/apache/excalibur/fortress
                        DefaultContainerManager.java
  Log:
  resolve conflicts
  
  Revision  Changes    Path
  1.21      +4 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java
  
  Index: DefaultContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultContainerManager.java	7 Aug 2002 04:55:55 -0000	1.20
  +++ DefaultContainerManager.java	7 Aug 2002 13:12:23 -0000	1.21
  @@ -141,14 +141,14 @@
                   logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
               }
               logger.fatalError( "Unable to initialize the contextManager.", e );
  -            
  +
               // What should happen now.  There needs to be a failure mode here.
               // As is, this will result in an NPE, but it can't really be allowed
               // to continue without having been initialized.
               return null;
           }
       }
  -    
  +
       protected Logger createLoggerFromContext( Context initParameters )
       {
           try
  @@ -346,3 +346,4 @@
       }
   
   }
  +
  
  
  

--
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