[camel] branch master updated: CAMEL-14354: camel-core optimize

[da...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 8a28ab1  CAMEL-14354: camel-core optimize
8a28ab1 is described below

commit 8a28ab117d2786390c15b025fac7798eb7cfcb67
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jan 25 17:45:25 2020 +0100

    CAMEL-14354: camel-core optimize
---
 .../src/main/java/org/apache/camel/processor/PipelineHelper.java        | 2 +-
 .../camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java   | 2 +-
 .../apache/camel/processor/aggregate/UseLatestAggregationStrategy.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java b/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
index 6d7308e..9b5dc5f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
@@ -41,7 +41,7 @@ public final class PipelineHelper {
     public static boolean continueProcessing(Exchange exchange, String message, Logger log) {
         // check for error if so we should break out
         boolean exceptionHandled = hasExceptionBeenHandledByErrorHandler(exchange);
-        if (exchange.isFailed() || exchange.isRollbackOnly() || exchange.isRollbackOnlyLast() || exceptionHandled) {
+        if (exceptionHandled || exchange.isFailed() || exchange.isRollbackOnly() || exchange.isRollbackOnlyLast()) {
             // The Exchange.ERRORHANDLED_HANDLED property is only set if satisfactory handling was done
             // by the error handler. It's still an exception, the exchange still failed.
             if (log.isDebugEnabled()) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
index b72954a..a145399 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
@@ -107,7 +107,7 @@ public final class ShareUnitOfWorkAggregationStrategy extends ServiceSupport imp
     protected void propagateFailure(Exchange answer, Exchange newExchange) {
         // if new exchange failed then propagate all the error related properties to the answer
         boolean exceptionHandled = hasExceptionBeenHandledByErrorHandler(newExchange);
-        if (newExchange.isFailed() || newExchange.isRollbackOnly() || newExchange.isRollbackOnlyLast() || exceptionHandled) {
+        if (exceptionHandled || newExchange.isFailed() || newExchange.isRollbackOnly() || newExchange.isRollbackOnlyLast()) {
             if (newExchange.getException() != null) {
                 answer.setException(newExchange.getException());
             }
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
index 9f14eae..07a911b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
@@ -72,7 +72,7 @@ public class UseLatestAggregationStrategy implements AggregationStrategy {
 
         // propagate exception from old exchange if there isn't already an exception
         boolean exceptionHandled = hasExceptionBeenHandledByErrorHandler(oldExchange);
-        if (oldExchange.isFailed() || oldExchange.isRollbackOnly() || oldExchange.isRollbackOnlyLast() || exceptionHandled) {
+        if (exceptionHandled || oldExchange.isFailed() || oldExchange.isRollbackOnly() || oldExchange.isRollbackOnlyLast()) {
             // propagate failure by using old exchange as the answer
             return oldExchange;
         }