cvs commit: jakarta-log4j/src/java/org/apache/log4j MDC.java

mwomack     2002/07/06 23:45:47

  Modified:    src/java/org/apache/log4j Tag: v1_2-branch MDC.java
  Log:
  Fix for bug #10528.  Hashtable does not support null value for key (unlike HashMap), so check for null key value before getting value.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +6 -6      jakarta-log4j/src/java/org/apache/log4j/MDC.java
  
  Index: MDC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/MDC.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- MDC.java	21 Oct 2001 14:06:44 -0000	1.10
  +++ MDC.java	7 Jul 2002 06:45:46 -0000	1.10.2.1
  @@ -104,8 +104,8 @@
       } else {
         Hashtable ht = (Hashtable) ((ThreadLocalMap)tlm).get();
         if(ht == null) {
  -	ht = new Hashtable(HT_SIZE);
  -	((ThreadLocalMap)tlm).set(ht);
  +        ht = new Hashtable(HT_SIZE);
  +        ((ThreadLocalMap)tlm).set(ht);
         }    
         ht.put(key, o);
       }
  @@ -117,10 +117,10 @@
         return null;
       } else {       
         Hashtable ht = (Hashtable) ((ThreadLocalMap)tlm).get();
  -      if(ht != null) {
  -	return ht.get(key);
  +      if(ht != null && key != null) {
  +        return ht.get(key);
         } else {
  -	return null;
  +        return null;
         }
       }
     }
  @@ -130,7 +130,7 @@
       if(!java1) {
         Hashtable ht = (Hashtable) ((ThreadLocalMap)tlm).get();
         if(ht != null) {
  -	ht.remove(key);
  +        ht.remove(key);
         } 
       }
     }