Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 63351 invoked from network); 14 Apr 2008 04:21:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Apr 2008 04:21:48 -0000 Received: (qmail 72616 invoked by uid 500); 14 Apr 2008 04:21:49 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 72594 invoked by uid 500); 14 Apr 2008 04:21:49 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 72585 invoked by uid 99); 14 Apr 2008 04:21:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Apr 2008 21:21:49 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Apr 2008 04:21:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 46E091A9832; Sun, 13 Apr 2008 21:21:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r647657 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/model/ProcessorType.java test/java/org/apache/camel/issues/InterceptorLogTest.java Date: Mon, 14 Apr 2008 04:21:23 -0000 To: camel-commits@activemq.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080414042124.46E091A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Sun Apr 13 21:21:20 2008 New Revision: 647657 URL: http://svn.apache.org/viewvc?rev=647657&view=rev Log: CAMEL-461 - Fixed intercept logging all steps failing due proceed not working. Applied patch from Jonathan with thanks. Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=647657&r1=647656&r2=647657&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Sun Apr 13 21:21:20 2008 @@ -50,7 +50,6 @@ import org.apache.camel.processor.MulticastProcessor; import org.apache.camel.processor.Pipeline; import org.apache.camel.processor.RecipientList; -import org.apache.camel.processor.SetHeaderProcessor; import org.apache.camel.processor.aggregate.AggregationCollection; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.idempotent.IdempotentConsumer; @@ -73,11 +72,7 @@ private LinkedList blocks = new LinkedList(); private ProcessorType parent; - // else to use an - // optional - // attribute in - // JAXB2 - + // else to use an optional attribute in JAXB2 public abstract List> getOutputs(); @@ -880,6 +875,11 @@ break; } } + + if (this instanceof InterceptType) { + proceed = ((InterceptType) this).getProceed(); + } + if (proceed == null) { throw new IllegalArgumentException("Cannot use proceed() without being within an intercept() block"); } Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java?rev=647657&r1=647656&r2=647657&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java Sun Apr 13 21:21:20 2008 @@ -11,7 +11,9 @@ public void testInterceptor() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); + // TODO: we should only expect 1 message, but seda queues can sometimes send multiple + mock.expectedMinimumMessageCount(1); + mock.expectedBodiesReceived("Hello World"); template.sendBody("seda:foo", "Hello World"); @@ -21,9 +23,9 @@ protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - // lets log all steps in all routes - // TODO: this does not work as expected. if enabled the exchange is not routed to seda:bar - //intercept().to("log:foo"); + // lets log all steps in all routes (must use proceed to let the exchange gots by its + // normal route path instead of swalling it here by our interception + intercept().to("log:foo").proceed(); from("seda:foo").to("seda:bar"); from("seda:bar").to("mock:result");