You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2014/07/21 17:08:16 UTC
[2/2] git commit: [CAMEL-7456] Preserve get/set contract
[CAMEL-7456] Preserve get/set contract
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8ce1da8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8ce1da8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8ce1da8
Branch: refs/heads/master
Commit: e8ce1da8ec65b68d9609efc4b0b2581034ec4fe1
Parents: 02da984
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Mon Jul 21 16:07:14 2014 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Mon Jul 21 16:07:14 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/e8ce1da8/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 3a7c13d..24b2eba 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
@@ -76,7 +76,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;
@@ -156,7 +158,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);
}
@@ -204,8 +206,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);
}
}
@@ -215,8 +218,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);
}
}