[camel] branch master updated: CAMEL-14414: 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


The following commit(s) were added to refs/heads/master by this push:
     new c733bd7  CAMEL-14414: Polished
c733bd7 is described below

commit c733bd71124b6f0e30a1394c80745928dc3f4d11
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jan 23 09:57:23 2020 +0100

    CAMEL-14414: Polished
---
 .../org/apache/camel/processor/aggregate/AggregateProcessor.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 83578eb..42cdae8 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -434,14 +434,12 @@ public class AggregateProcessor extends 
AsyncProcessorSupport implements Navigat
     private Object removeFlagCompleteAllGroups(Exchange exchange) {
         Object removedHeader = 
exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS);
         Object removedProp = 
exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS);
-
         return removedHeader == null ? removedProp: removedHeader;
     }
 
     private Boolean isCompleteAllGroups(Exchange exchange) {
-        Boolean retVal;
-        retVal = 
exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, 
boolean.class);
-        if(!Boolean.TRUE.equals(retVal)) {
+        boolean retVal = 
exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, 
boolean.class);
+        if (!retVal) {
             // according to doc it is a property but it is sometimes read as 
header
             // some test don't fail because they use the header expression 
which contains a fallback to properties
             retVal = 
exchange.getProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, 
boolean.class);