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 4B5649A36 for ; Sat, 21 Apr 2012 14:52:02 +0000 (UTC) Received: (qmail 70319 invoked by uid 500); 21 Apr 2012 14:52:02 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 70292 invoked by uid 500); 21 Apr 2012 14:52:02 -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 70285 invoked by uid 99); 21 Apr 2012 14:52:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Apr 2012 14:52:02 +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; Sat, 21 Apr 2012 14:51:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51ED9238896F; Sat, 21 Apr 2012 14:51:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1328675 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/processor: RedeliveryErrorHandler.java TryProcessor.java Date: Sat, 21 Apr 2012 14:51:38 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120421145138.51ED9238896F@eris.apache.org> Author: davsclaus Date: Sat Apr 21 14:51:37 2012 New Revision: 1328675 URL: http://svn.apache.org/viewvc?rev=1328675&view=rev Log: CAMEL-5201: redelivery exhausted marker should be cleared by try catch EIP and when errorHandler handles the message Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1328675&r1=1328674&r2=1328675&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java Sat Apr 21 14:51:37 2012 @@ -722,6 +722,7 @@ public abstract class RedeliveryErrorHan exchange.getIn().removeHeader(Exchange.REDELIVERED); exchange.getIn().removeHeader(Exchange.REDELIVERY_COUNTER); exchange.getIn().removeHeader(Exchange.REDELIVERY_MAX_COUNTER); + exchange.removeProperty(Exchange.REDELIVERY_EXHAUSTED); // and remove traces of rollback only and uow exhausted markers exchange.removeProperty(Exchange.ROLLBACK_ONLY); @@ -910,6 +911,13 @@ public abstract class RedeliveryErrorHan */ private boolean isExhausted(Exchange exchange, RedeliveryData data) { // if marked as rollback only then do not continue/redeliver + boolean exhausted = exchange.getProperty(Exchange.REDELIVERY_EXHAUSTED, false, Boolean.class); + if (exhausted) { + log.trace("This exchange is marked as redelivery exhausted: {}", exchange); + return true; + } + + // if marked as rollback only then do not continue/redeliver boolean rollbackOnly = exchange.getProperty(Exchange.ROLLBACK_ONLY, false, Boolean.class); if (rollbackOnly) { log.trace("This exchange is marked as rollback only, so forcing it to be exhausted: {}", exchange); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java?rev=1328675&r1=1328674&r2=1328675&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java Sat Apr 21 14:51:37 2012 @@ -382,6 +382,8 @@ public class TryProcessor extends Servic exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); } } + // always clear redelivery exhausted in a catch clause + exchange.removeProperty(Exchange.REDELIVERY_EXHAUSTED); // signal callback to continue routing async ExchangeHelper.prepareOutToIn(exchange); @@ -396,6 +398,8 @@ public class TryProcessor extends Servic exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); } } + // always clear redelivery exhausted in a catch clause + exchange.removeProperty(Exchange.REDELIVERY_EXHAUSTED); } return sync;