This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new c9230f4 Polished c9230f4 is described below commit c9230f44272310503dc3ccde49ac5ceefc19e4a9 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Dec 16 08:39:02 2021 +0100 Polished --- .../src/main/java/org/apache/camel/Exchange.java | 2 +- .../apache/camel/support/DefaultExchangeHolder.java | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java index 5f34c55..52d4707 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java +++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java @@ -422,7 +422,7 @@ public interface Exchange { Map<String, Object> getAllProperties(); /** - * Returns whether any properties has been set + * Returns whether any properties have been set * * @return <tt>true</tt> if any properties has been set */ diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java index 2436f04..405cd75 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java @@ -25,7 +25,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; import org.apache.camel.RuntimeExchangeException; import org.apache.camel.WrappedFile; import org.apache.camel.util.ObjectHelper; @@ -231,25 +230,12 @@ public class DefaultExchangeHolder implements Serializable { } private Map<String, Object> safeSetProperties(Exchange exchange, boolean allowSerializedHeaders) { - if (exchange.hasProperties()) { - Map<String, Object> map = checkValidExchangePropertyObjects("properties", exchange, exchange.getProperties(), - allowSerializedHeaders); - if (map != null && !map.isEmpty()) { - properties = new LinkedHashMap<>(map); - } - } // also include the internal properties - Map<String, Object> map = checkValidExchangePropertyObjects("properties", exchange, - exchange.adapt(ExtendedExchange.class).getInternalProperties(), + Map<String, Object> map = checkValidExchangePropertyObjects("properties", exchange, exchange.getAllProperties(), allowSerializedHeaders); if (map != null && !map.isEmpty()) { - if (properties == null) { - properties = new LinkedHashMap<>(map); - } else { - properties.putAll(map); - } + properties = new LinkedHashMap<>(map); } - return null; }