Return-Path: 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 F0F91906C for ; Fri, 13 Jan 2012 22:39:41 +0000 (UTC) Received: (qmail 34945 invoked by uid 500); 13 Jan 2012 22:39:41 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 34918 invoked by uid 500); 13 Jan 2012 22:39:41 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 34910 invoked by uid 99); 13 Jan 2012 22:39:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jan 2012 22:39:41 +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; Fri, 13 Jan 2012 22:39:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 018C423888FD; Fri, 13 Jan 2012 22:39:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1231361 - in /logging/log4j/trunk/src: changes/changes.xml main/java/org/apache/log4j/MDC.java Date: Fri, 13 Jan 2012 22:39:19 -0000 To: commits@logging.apache.org From: grobmeier@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120113223920.018C423888FD@eris.apache.org> Author: grobmeier Date: Fri Jan 13 22:39:19 2012 New Revision: 1231361 URL: http://svn.apache.org/viewvc?rev=1231361&view=rev Log: 50486 applied patch for memory leak thanks to Yingchun Chen and chahuistle Modified: logging/log4j/trunk/src/changes/changes.xml logging/log4j/trunk/src/main/java/org/apache/log4j/MDC.java Modified: logging/log4j/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=1231361&r1=1231360&r2=1231361&view=diff ============================================================================== --- logging/log4j/trunk/src/changes/changes.xml (original) +++ logging/log4j/trunk/src/changes/changes.xml Fri Jan 13 22:39:19 2012 @@ -22,6 +22,7 @@ log4j 1.2.17 release preparation + Memoryleak - org.apache.log4j.helpers.ThreadLocalMap Eliminate duplicates in OSGi Import-Package directive. DOMConfigurator does not close input stream when configured based on URL. javadoc.jar was missing NOTICE and LICENSE and contained .svn entries. Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/MDC.java URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/MDC.java?rev=1231361&r1=1231360&r2=1231361&view=diff ============================================================================== --- logging/log4j/trunk/src/main/java/org/apache/log4j/MDC.java (original) +++ logging/log4j/trunk/src/main/java/org/apache/log4j/MDC.java Fri Jan 13 22:39:19 2012 @@ -180,7 +180,8 @@ public class MDC { Hashtable ht = (Hashtable) ((ThreadLocalMap)tlm).get(); if(ht != null) { ht.clear(); - } + } + ((ThreadLocalMap)tlm).remove(); } }