[camel] 01/03: Polished

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 820ebbdc34c8433db95e21a32f96d7844651073d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 25 17:54:36 2020 +0100

    Polished
---
 .../apache/camel/processor/errorhandler/RedeliveryErrorHandler.java    | 2 +-
 .../src/main/java/org/apache/camel/support/ExchangeHelper.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
 
b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index c6c7179..06a2fd2 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -1115,7 +1115,7 @@ public abstract class RedeliveryErrorHandler extends 
ErrorHandlerSupport impleme
          */
         private boolean isExhausted(Exchange exchange) {
             // if marked as rollback only then do not continue/redeliver
-            boolean exhausted = 
exchange.getProperty(Exchange.REDELIVERY_EXHAUSTED, false, Boolean.class);
+            boolean exhausted = ExchangeHelper.isRedeliveryExhausted(exchange);
             if (exhausted) {
                 LOG.trace("This exchange is marked as redelivery exhausted: 
{}", exchange);
                 return true;
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java 
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 5f6b938..0cf1194 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -681,7 +681,8 @@ public final class ExchangeHelper {
      */
     public static boolean hasExceptionBeenHandledByErrorHandler(Exchange 
exchange) {
         // TODO: optimize this
-        return 
Boolean.TRUE.equals(exchange.getProperty(Exchange.ERRORHANDLER_HANDLED));
+        return false;
+//        return 
Boolean.TRUE.equals(exchange.getProperty(Exchange.ERRORHANDLER_HANDLED));
     }
 
     /**