[camel] branch master updated: ErrorHandlerReifier#configure: Fix setting of Route#setAllowUseOriginalMessage

[acosentino]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7388d09  ErrorHandlerReifier#configure: Fix setting of 
Route#setAllowUseOriginalMessage
     new 4d98eca  Merge pull request #3710 from 
PascalSchumacher/ErrorHandlerReifier#configure
7388d09 is described below

commit 7388d09ec2246a83490ce1674f251a7e5939910c
Author: Pascal Schumacher <pascalschumac...@gmx.net>
AuthorDate: Sun Apr 5 11:39:38 2020 +0200

    ErrorHandlerReifier#configure: Fix setting of 
Route#setAllowUseOriginalMessage
    
    Use RedeliveryErrorHandler#isUseOriginalBodyPolicy for one of the checks 
instead of checking for RedeliveryErrorHandler#isUseOriginalMessagePolicy twice.
---
 .../java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index c74447d..e66b01f 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -305,7 +305,7 @@ public abstract class ErrorHandlerReifier<T extends 
ErrorHandlerBuilderSupport>
             }
         }
         if (handler instanceof RedeliveryErrorHandler) {
-            boolean original = 
((RedeliveryErrorHandler)handler).isUseOriginalMessagePolicy() || 
((RedeliveryErrorHandler)handler).isUseOriginalMessagePolicy();
+            boolean original = 
((RedeliveryErrorHandler)handler).isUseOriginalMessagePolicy() || 
((RedeliveryErrorHandler)handler).isUseOriginalBodyPolicy();
             if (original) {
                 // ensure allow original is turned on
                 route.setAllowUseOriginalMessage(true);