svn commit: r580687 - /mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java

[trustin]

Author: trustin
Date: Sun Sep 30 02:19:28 2007
New Revision: 580687

URL: http://svn.apache.org/viewvc?rev=580687&view=rev
Log:
* Explicitly called ThreadLocal.remove() to prevent unnecessary memory 
consumption
* Made getContext() private because Context class is a private class

Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java?rev=580687&r1=580686&r2=580687&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
 Sun Sep 30 02:19:28 2007
@@ -73,16 +73,17 @@
             callDepth.set (callDepth.get() - 1);
             if (callDepth.get() == 0) {
                 /* remove context from the MDC */
-                for (Object key : context.keySet()) {
-                    MDC.remove(key.toString());
+                for (String key : context.keySet()) {
+                    MDC.remove(key);
                 }
                 MDC.remove("name");
+                callDepth.remove();
             }
         }
     }
 
 
-    public static Context getContext(final IoSession session) {
+    private static Context getContext(final IoSession session) {
         Context context = (Context) session.getAttribute(CONTEXT_KEY);
         if (context == null) {
             context = new Context();
@@ -125,10 +126,6 @@
     }
 
     private static class Context extends HashMap<String,String> {
-
-        /**
-         *
-         */
         private static final long serialVersionUID = -673025693009555560L;
     }