camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [2/2] git commit: [CAMEL-7456] Preserve get/set contract
Date Mon, 21 Jul 2014 15:13:15 GMT
[CAMEL-7456] Preserve get/set contract

(cherry picked from commit e8ce1da8ec65b68d9609efc4b0b2581034ec4fe1)


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

Branch: refs/heads/camel-2.12.x
Commit: db17110548d1f8bd4ac4873f4a34bdd748b3cfc3
Parents: c8b8b83
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
Authored: Mon Jul 21 16:07:14 2014 +0200
Committer: Grzegorz Grzybek <gr.grzybek@gmail.com>
Committed: Mon Jul 21 17:12:33 2014 +0200

----------------------------------------------------------------------
 .../camel/component/properties/PropertiesComponent.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/db171105/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 f5572b8..b690a51 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
@@ -78,7 +78,9 @@ public class PropertiesComponent extends DefaultComponent {
     private boolean ignoreMissingLocation;
     private boolean cache = true;
     private String propertyPrefix;
+    private String propertyPrefixResolved;
     private String propertySuffix;
+    private String propertySuffixResolved;
     private boolean fallbackToUnaugmentedProperty = true;
     private String prefixToken = DEFAULT_PREFIX_TOKEN;
     private String suffixToken = DEFAULT_SUFFIX_TOKEN;
@@ -158,7 +160,7 @@ public class PropertiesComponent extends DefaultComponent {
         
         if (propertiesParser instanceof AugmentedPropertyNameAwarePropertiesParser) {
             return ((AugmentedPropertyNameAwarePropertiesParser) propertiesParser).parseUri(uri,
prop, prefixToken, suffixToken,
-                                                                                        
   propertyPrefix, propertySuffix, fallbackToUnaugmentedProperty);
+                                                                                        
   propertyPrefixResolved, propertySuffixResolved, fallbackToUnaugmentedProperty);
         } else {
             return propertiesParser.parseUri(uri, prop, prefixToken, suffixToken);
         }
@@ -206,8 +208,9 @@ public class PropertiesComponent extends DefaultComponent {
 
     public void setPropertyPrefix(String propertyPrefix) {
         this.propertyPrefix = propertyPrefix;
+        this.propertyPrefixResolved = propertyPrefix;
         if (ObjectHelper.isNotEmpty(this.propertyPrefix)) {
-            this.propertyPrefix = FilePathResolver.resolvePath(this.propertyPrefix);
+            this.propertyPrefixResolved = FilePathResolver.resolvePath(this.propertyPrefix);
         }
     }
 
@@ -217,8 +220,9 @@ public class PropertiesComponent extends DefaultComponent {
 
     public void setPropertySuffix(String propertySuffix) {
         this.propertySuffix = propertySuffix;
+        this.propertySuffixResolved = propertySuffix;
         if (ObjectHelper.isNotEmpty(this.propertySuffix)) {
-            this.propertySuffix = FilePathResolver.resolvePath(this.propertySuffix);
+            this.propertySuffixResolved = FilePathResolver.resolvePath(this.propertySuffix);
         }
     }
 


Mime
View raw message