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) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5127a659 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5127a659 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5127a659 Branch: refs/heads/master Commit: 5127a6598582cb370dd46de6c510d0762695daaa Parents: d36d2e5 Author: Zipay, Matthew <mzi...@contractor.express.com> Authored: Wed Jul 13 17:51:15 2016 -0400 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Thu Jul 21 08:53:26 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/blueprint/BlueprintPropertiesParser.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5127a659/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; }