cvs commit: logging-log4j/src/java/org/apache/log4j LogManager.java

hoju        2004/11/30 21:59:03

  Modified:    src/java/org/apache/log4j LogManager.java
  Log:
  Make sure the default logger repository isn't null in a new selector that has been passed into
setRepositorySelector().  This avoids catastrophic failure of all apps in a container (tested with Tomcat).

  Jake

  Revision  Changes    Path
  1.26      +4 -0      logging-log4j/src/java/org/apache/log4j/LogManager.java

  Index: LogManager.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/LogManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- LogManager.java	30 Nov 2004 18:52:17 -0000	1.25
  +++ LogManager.java	1 Dec 2004 05:59:03 -0000	1.26
   <at>  <at>  -150,6 +150,10  <at>  <at> 
           "RepositorySelector must be non-null.");
       }

  +    if(selector.getDefaultRepository() == null) {
  +      selector.setDefaultRepository(repositorySelector.getDefaultRepository());
  +    }
  +
       LogManager.guard = guard;
       LogManager.repositorySelector = selector;
     }