[camel] 01/03: CAMEL-14354: camel-core optimize

[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 041280874e7e018882f9d4c2caf12914ea78ae99
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 25 20:09:03 2020 +0100

    CAMEL-14354: camel-core optimize
---
 core/camel-api/src/main/java/org/apache/camel/Exchange.java          | 1 +
 .../src/main/java/org/apache/camel/support/DefaultExchange.java      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 4bb713e..369cc00 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
@@ -303,6 +303,7 @@ public interface Exchange {
      * @return the value of the given property or <tt>defaultValue</tt> if 
there is no
      *         property for the given name
      */
+    @Deprecated
     Object getProperty(String name, Object defaultValue);
 
     /**
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
index 8beb3da..995f306 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchange.java
@@ -202,7 +202,10 @@ public final class DefaultExchange implements 
ExtendedExchange {
     @Override
     @SuppressWarnings("unchecked")
     public <T> T getProperty(String name, Object defaultValue, Class<T> type) {
-        Object value = getProperty(name, defaultValue);
+        Object value = getProperty(name);
+        if (value == null) {
+            value = defaultValue;
+        }
         if (value == null) {
             // lets avoid NullPointerException when converting to boolean for 
null values
             if (boolean.class == type) {