You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2016/07/21 07:13:09 UTC
[2/4] camel git commit: CAMEL-10038 don't throw exception if
BlueprintPropertiesParser#parseProperty would return null (breaks
fallbackToUnaugmentedProperty behavior,
and an exception will be thrown anyway by the parent DefaultPropertiesParser
if the val
CAMEL-10038 don't throw exception if BlueprintPropertiesParser#parseProperty would return null (breaks fallbackToUnaugmentedProperty behavior, and an exception will be thrown anyway by the parent DefaultPropertiesParser if the value is still null after fallback)
(cherry picked from commit affda62f8654a2862650cdf5142371ebb4649703)
(cherry picked from commit 5127a6598582cb370dd46de6c510d0762695daaa)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ffd8e0d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ffd8e0d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ffd8e0d
Branch: refs/heads/camel-2.17.x
Commit: 2ffd8e0d83aa3a79c43cb73186fc7fa1ed07ca0a
Parents: 1ac5c47
Author: Zipay, Matthew <mz...@contractor.express.com>
Authored: Wed Jul 13 17:51:15 2016 -0400
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Thu Jul 21 08:59:57 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/blueprint/BlueprintPropertiesParser.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ffd8e0d/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
index efc5347..c04e31e 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
@@ -160,10 +160,6 @@ public class BlueprintPropertiesParser extends DefaultPropertiesParser {
}
}
- if (answer == null) {
- throw new IllegalArgumentException("Property placeholder key: " + key + " not found");
- }
-
log.trace("Returning parsed property key: {} as value: {}", key, answer);
return answer;
}