camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: CAMEL-10822 - Camel Jasypt component throws NPE. Thanks to Joe Luo for the patch.
Date Tue, 14 Feb 2017 09:08:14 GMT
Repository: camel
Updated Branches:
  refs/heads/master 99dff7d7f -> 8a70c60d8


CAMEL-10822 - Camel Jasypt component throws NPE. Thanks to Joe Luo for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a70c60d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a70c60d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a70c60d

Branch: refs/heads/master
Commit: 8a70c60d8be187ef80daca054dd80536d7ad9b45
Parents: 99dff7d
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Tue Feb 14 10:07:15 2017 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Tue Feb 14 10:07:15 2017 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/jasypt/JasyptPropertiesParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8a70c60d/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
----------------------------------------------------------------------
diff --git a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
index 60f2fef..aa86a0c 100755
--- a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
+++ b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
@@ -91,7 +91,7 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
         if (password.startsWith("sysenv:")) {
             password = System.getenv(ObjectHelper.after(password, "sysenv:"));
         }
-        if (password.startsWith("sys:")) {
+        if (ObjectHelper.isNotEmpty(password) && password.startsWith("sys:")) {
             password = System.getProperty(ObjectHelper.after(password, "sys:"));
         }
         this.password = password;


Mime
View raw message