Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 79AA998DF for ; Wed, 5 Oct 2011 16:13:17 +0000 (UTC) Received: (qmail 68524 invoked by uid 500); 5 Oct 2011 16:13:17 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 68487 invoked by uid 500); 5 Oct 2011 16:13:17 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 68480 invoked by uid 99); 5 Oct 2011 16:13:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 16:13:17 +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; Wed, 05 Oct 2011 16:13:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EDCF023889D7 for ; Wed, 5 Oct 2011 16:12:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1179291 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/interceptor/ test/java/org/apache/camel/processor/interceptor/ Date: Wed, 05 Oct 2011 16:12:55 -0000 To: commits@camel.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111005161255.EDCF023889D7@eris.apache.org> Author: cschneider Date: Wed Oct 5 16:12:55 2011 New Revision: 1179291 URL: http://svn.apache.org/viewvc?rev=1179291&view=rev Log: CAMEL-4500 Bugfix for handling more than one handler and for changing the handler of an interceptor Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=1179291&r1=1179290&r2=1179291&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Wed Oct 5 16:12:55 2011 @@ -16,6 +16,9 @@ */ package org.apache.camel.processor.interceptor; +import java.util.ArrayList; +import java.util.List; + import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -58,6 +61,7 @@ public class TraceInterceptor extends De private TraceFormatter formatter; private RouteContext routeContext; + private List traceHandlers; public TraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer) { super(target); @@ -68,6 +72,8 @@ public class TraceInterceptor extends De if (tracer.getFormatter() != null) { this.formatter = tracer.getFormatter(); } + this.traceHandlers = new ArrayList(); + this.traceHandlers.addAll(tracer.getTraceHandlers()); } @Override @@ -281,14 +287,14 @@ public class TraceInterceptor extends De } protected void traceExchange(Exchange exchange) throws Exception { - for (TraceEventHandler traceHandler : tracer.getTraceHandlers()) { + for (TraceEventHandler traceHandler : traceHandlers) { traceHandler.traceExchange(node, processor, this, exchange); } } protected Object traceExchangeIn(Exchange exchange) throws Exception { Object result = null; - for (TraceEventHandler traceHandler : tracer.getTraceHandlers()) { + for (TraceEventHandler traceHandler : traceHandlers) { Object result1 = traceHandler.traceExchangeIn(node, processor, this, exchange); if (result1 != null) { result = result1; @@ -298,7 +304,7 @@ public class TraceInterceptor extends De } protected void traceExchangeOut(Exchange exchange, Object traceState) throws Exception { - for (TraceEventHandler traceHandler : tracer.getTraceHandlers()) { + for (TraceEventHandler traceHandler : traceHandlers) { traceHandler.traceExchangeOut(node, processor, this, exchange, traceState); } } @@ -350,12 +356,18 @@ public class TraceInterceptor extends De @Override protected void doStart() throws Exception { super.doStart(); - ServiceHelper.startService(tracer.getTraceHandlers()); + ServiceHelper.startService(traceHandlers); } @Override protected void doStop() throws Exception { super.doStop(); - ServiceHelper.stopService(tracer.getTraceHandlers()); + ServiceHelper.stopService(traceHandlers); + } + + @Deprecated + public void setTraceHandler(TraceEventHandler traceHandler) { + traceHandlers.clear(); + traceHandlers.add(traceHandler); } } Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=1179291&r1=1179290&r2=1179291&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Wed Oct 5 16:12:55 2011 @@ -308,7 +308,8 @@ public class Tracer implements Intercept */ @Deprecated public void setTraceHandler(TraceEventHandler traceHandler) { - this.traceHandlers.add(0, traceHandler); + this.traceHandlers.clear(); + this.traceHandlers.add(traceHandler); } /** Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java?rev=1179291&r1=1179290&r2=1179291&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java Wed Oct 5 16:12:55 2011 @@ -44,7 +44,7 @@ public class TraceInterceptorFactoryCrea if (traceAllNodes || !target.getClass().equals(TraceTestProcessor.class)) { TraceHandlerTestHandler traceHandler = new TraceHandlerTestHandler(eventMessages); traceHandler.setTraceAllNodes(true); - tracer.addTraceHandler(traceHandler); + interceptor.setTraceHandler(traceHandler); } return interceptor;