Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11392D52E for ; Thu, 8 Nov 2012 18:13:42 +0000 (UTC) Received: (qmail 75236 invoked by uid 500); 8 Nov 2012 18:13:42 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 75155 invoked by uid 500); 8 Nov 2012 18:13:41 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 75135 invoked by uid 99); 8 Nov 2012 18:13:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 18:13: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; Thu, 08 Nov 2012 18:13:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 83D2C23888EA for ; Thu, 8 Nov 2012 18:13:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1407200 - /activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java Date: Thu, 08 Nov 2012 18:13:20 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121108181320.83D2C23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Thu Nov 8 18:13:20 2012 New Revision: 1407200 URL: http://svn.apache.org/viewvc?rev=1407200&view=rev Log: Protect against appending recursion (In case your JMS provider appends to log4j in the process of sending a JMS message). Modified: activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java Modified: activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java?rev=1407200&r1=1407199&r2=1407200&view=diff ============================================================================== --- activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java (original) +++ activemq/trunk/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java Thu Nov 8 18:13:20 2012 @@ -137,13 +137,20 @@ public abstract class JmsLogAppenderSupp return getSession().createProducer(null); } + private static final ThreadLocal APPENDING = new ThreadLocal(); + protected void append(LoggingEvent event) { - try { - Message message = createMessage(event); - Destination destination = getDestination(event); - getProducer().send(destination, message); - } catch (Exception e) { - getErrorHandler().error("Could not send message due to: " + e, e, JMS_PUBLISH_ERROR_CODE, event); + if( APPENDING.get()==null ) { + APPENDING.set(true); + try { + Message message = createMessage(event); + Destination destination = getDestination(event); + getProducer().send(destination, message); + } catch (Exception e) { + getErrorHandler().error("Could not send message due to: " + e, e, JMS_PUBLISH_ERROR_CODE, event); + } finally { + APPENDING.remove(); + } } }