camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1303561 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java camel-core/src/test/java/org/apache/camel/processor/SplitSubUnitOfWorkStopOnExceptionIssueTest.java
Date Wed, 21 Mar 2012 20:30:10 GMT
Author: davsclaus
Date: Wed Mar 21 20:30:09 2012
New Revision: 1303561

URL: http://svn.apache.org/viewvc?rev=1303561&view=rev
Log:
CAMEL-5110: Fixed using shareUnitOfWork option with DLC error handler routing to route as
DLQ not working as expected.

Added:
    camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/SplitSubUnitOfWorkStopOnExceptionIssueTest.java
      - copied unchanged from r1303557, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitSubUnitOfWorkStopOnExceptionIssueTest.java
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1303557

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1303561&r1=1303560&r2=1303561&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Wed Mar 21 20:30:09 2012
@@ -719,6 +719,11 @@ public abstract class RedeliveryErrorHan
             exchange.getIn().removeHeader(Exchange.REDELIVERED);
             exchange.getIn().removeHeader(Exchange.REDELIVERY_COUNTER);
             exchange.getIn().removeHeader(Exchange.REDELIVERY_MAX_COUNTER);
+
+            // and remove traces of rollback only and uow exhausted markers
+            exchange.removeProperty(Exchange.ROLLBACK_ONLY);
+            exchange.removeProperty(Exchange.UNIT_OF_WORK_EXHAUSTED);
+
             handled = true;
         } else {
             // must decrement the redelivery counter as we didn't process the redelivery
but is



Mime
View raw message