Permalink
Browse files

CAMEL-5973: Fixed property placeholder with blueprint and delegate no…

…t working such as when using jasypt.

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1433518 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent fbae692 commit 5582a0e040e46130420512ce3f45d55a266f88f2 @davsclaus davsclaus committed Jan 15, 2013
@@ -128,9 +128,13 @@ public String parseProperty(String key, String value, Properties properties) {
}
}
- if (answer == null && delegate != null) {
- // let delegate have a try since blueprint didn't resolve it
- answer = delegate.parseProperty(key, value, properties);
+ // if there is a delegate then let it parse the current answer as it may be jasypt which
+ // need to decrypt values
+ if (delegate != null) {
+ String delegateAnswer = delegate.parseProperty(key, answer != null ? answer : value, properties);
+ if (delegateAnswer != null) {
+ answer = delegateAnswer;
+ }
}
log.trace("Returning parsed property key: {} as value: {}", key, answer);

0 comments on commit 5582a0e

Please sign in to comment.