You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@locus.apache.org on 2000/12/22 11:41:30 UTC

cvs commit: jakarta-log4j/org/apache/log4j/net/test jms.lcf

ceki        00/12/22 02:41:30

  Modified:    org/apache/log4j BasicConfigurator.java Hierarchy.java
  Added:       org/apache/log4j/net/test jms.lcf
  Log:
  BasicConfigurator.java Hierarchy.java have not changed.... This seems to happen from time...
  
  Revision  Changes    Path
  1.4       +3 -4      jakarta-log4j/org/apache/log4j/BasicConfigurator.java
  
  Index: BasicConfigurator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/BasicConfigurator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicConfigurator.java	2000/12/21 16:22:01	1.3
  +++ BasicConfigurator.java	2000/12/22 10:41:29	1.4
  @@ -270,21 +270,20 @@
     void resetConfiguration() {
   
       Category._default.getRoot().setPriority(Priority.DEBUG);
  -    Category._default.getRoot().removeAllAppenders();
       Category._default.root.setResourceBundle(null);
  -
       Category.disable =  Category.DISABLE_OFF;
       
       // the synchronization is needed to prevent JDK 1.2.x hashtable
       // surprises
  -    synchronized(Category._default.ht) {
  +    synchronized(Category._default.ht) {    
  +      Category._default.shutdown(); // nested locks are OK    
  +    
         Enumeration cats = Category.getCurrentCategories();
         while(cats.hasMoreElements()) {
   	Category c = (Category) cats.nextElement();
   	c.setPriority(null);
   	c.setAdditivity(true);
   	c.setResourceBundle(null);
  -	c.removeAllAppenders();
         }
       }
       Category._default.rendererMap.clear();
  
  
  
  1.5       +5 -6      jakarta-log4j/org/apache/log4j/Hierarchy.java
  
  Index: Hierarchy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/Hierarchy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Hierarchy.java	2000/12/21 16:22:02	1.4
  +++ Hierarchy.java	2000/12/22 10:41:29	1.5
  @@ -80,14 +80,13 @@
   
     /**
        This call will clear all category definitions from the internal
  -     hashtable. Invoking this method renders impossible the addition of new
  -     categories to the hiearchy.
  +     hashtable. Invoking this method will irrevocably mess up the
  +     category hiearchy.
        
  -     <p>You should really know what you are doing before invoking this
  -     method.
  +     <p>You should <em>really</em> know what you are doing before
  +     invoking this method.
   
  -     @since 0.9.0 
  -  */
  +     @since 0.9.0 */
     public
     void clear() {
       //System.out.println("\n\nAbout to clear internal hash table.");
  
  
  
  1.1                  jakarta-log4j/org/apache/log4j/net/test/jms.lcf
  
  Index: jms.lcf
  ===================================================================
  
  log4j.rootCategory=DEBUG, A1
  log4j.configDebug=true
  log4j.appender.A1=org.apache.log4j.net.JMSAppender