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:13:14 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 7bfed8285 -> da7d0aadd


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/da7d0aad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da7d0aad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da7d0aad

Branch: refs/heads/camel-2.17.x
Commit: da7d0aadd6f69c0bfb9f89e65df6d09e8d09b2bb
Parents: 7bfed82
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:10:46 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/da7d0aad/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 f089533..be7e79f 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
@@ -92,7 +92,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