Author: davsclaus
Date: Tue Jan 15 17:01:58 2013
New Revision: 1433522

URL: http://svn.apache.org/viewvc?rev=1433522&view=rev
Log:
CAMEL-5973: Fixed property placeholder with blueprint and delegate not working 
such as when using jasypt.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1433518

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java?rev=1433522&r1=1433521&r2=1433522&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
 Tue Jan 15 17:01:58 2013
@@ -128,9 +128,13 @@ public class BlueprintPropertiesParser e
             }
         }
 
-        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);


Reply via email to