You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/04/21 16:51:38 UTC
svn commit: r1328675 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/processor:
RedeliveryErrorHandler.java TryProcessor.java
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;