Return-Path: 
 <commits-return-3039-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CEF9C1076E
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Tue, 15 Oct 2013 17:07:47 +0000 (UTC)
Received: (qmail 80945 invoked by uid 500); 15 Oct 2013 17:07:47 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 80922 invoked by uid 500); 15 Oct 2013 17:07:47 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 80915 invoked by uid 99); 15 Oct 2013 17:07:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 17:07:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 17:07:44 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0F5422388868;
	Tue, 15 Oct 2013 17:07:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1532438 - in /logging/log4j/log4j2/trunk:
 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
 src/changes/changes.xml
Date: Tue, 15 Oct 2013 17:07:22 -0000
To: commits@logging.apache.org
From: rpopma@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131015170723.0F5422388868@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rpopma
Date: Tue Oct 15 17:07:22 2013
New Revision: 1532438

URL: http://svn.apache.org/r1532438
Log:
LOG4J-323 memory leak fix for AsyncLogger

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1532438&r1=1532437&r2=1532438&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Tue Oct 15 17:07:22 2013
@@ -83,7 +83,7 @@ public class AsyncLogger extends Logger 
 
     private static ExecutorService executor = Executors
             .newSingleThreadExecutor(new DaemonThreadFactory("AsyncLogger-"));
-    private final ThreadLocal<Info> threadlocalInfo = new ThreadLocal<Info>();
+    private static ThreadLocal<Info> threadlocalInfo = new ThreadLocal<Info>();
 
     static {
         final int ringBufferSize = calculateRingBufferSize();
@@ -262,5 +262,6 @@ public class AsyncLogger extends Logger 
             }
         }
         executor.shutdown(); // finally, kill the processor thread
+        threadlocalInfo = new ThreadLocal<Info>(); // LOG4J2-323
     }
 }

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1532438&r1=1532437&r2=1532438&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Tue Oct 15 17:07:22 2013
@@ -21,6 +21,10 @@
   </properties>
   <body>
     <release version="2.0RC1" date="2013-MM-DD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-323" dev="rpopma" type="fix">
+        Resolved memory leak by releasing reference to ThreadLocal when 
+        AsyncLogger is stopped.
+      </action>
       <action issue="LOG4J2-425" dev="rpopma" type="fix">
         Resolved memory leak by populating AsyncLoggerConfigHelper ring buffer 
         via EventTranslatorTwoArg, eliminating the need for a ThreadLocal.