Repository: camel Updated Branches: refs/heads/master 49c304781 -> a19962b10
Fixed potential NPE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a19962b1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a19962b1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a19962b1 Branch: refs/heads/master Commit: a19962b10667c3c0f12e5a3861093d8df0daf4a7 Parents: 96f11c7 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jun 9 18:06:26 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 9 18:08:19 2016 +0200 ---------------------------------------------------------------------- .../apache/camel/component/properties/PropertiesComponent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a19962b1/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java index 77cbd6c..cfc0a39 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java @@ -246,7 +246,9 @@ public class PropertiesComponent extends UriEndpointComponent { * This option will override any default locations and only use the locations from this option. */ public void setLocation(String location) { - setLocations(location.split(",")); + if (location != null) { + setLocations(location.split(",")); + } } public String getEncoding() {
