ceki        2004/05/31 14:36:19

  Modified:    src/java/org/apache/log4j/joran JoranConfigurator.java
  Log:
  Fixes to avoid NullPointerExceptions
  
  Revision  Changes    Path
  1.14      +6 -0      
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java
  
  Index: JoranConfigurator.java
  ===================================================================
  RCS file: 
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JoranConfigurator.java    31 May 2004 21:30:37 -0000      1.13
  +++ JoranConfigurator.java    31 May 2004 21:36:19 -0000      1.14
  @@ -79,6 +79,9 @@
     }
   
     public void doConfigure(URL url, LoggerRepository repository) {
  +    // This line is needed here because there is logging from inside this method.
  +    this.repository = repository;
  +
       ExecutionContext ec = joranInterpreter.getExecutionContext();
       String errMsg;
       try {
  @@ -96,6 +99,9 @@
      * Configure a repository from a configuration file passed as parameter.
      */
     public void doConfigure(String filename, LoggerRepository repository) {
  +    // This line is needed here because there is logging from inside this method.
  +    this.repository = repository;
  +    
       FileInputStream fis = null;
       ExecutionContext ec = joranInterpreter.getExecutionContext();
       getLogger().info("in JoranConfigurator doConfigure "+filename);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to