You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/07/07 20:49:58 UTC
svn commit: r1143968 - in /camel/branches/camel-2.7.x: ./
camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
Author: dkulp
Date: Thu Jul 7 18:49:57 2011
New Revision: 1143968
URL: http://svn.apache.org/viewvc?rev=1143968&view=rev
Log:
Merged revisions 1135223 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1135223 | davsclaus | 2011-06-13 14:58:10 -0400 (Mon, 13 Jun 2011) | 1 line
CAMEL-4099: Fixed properties component not quoting replacement when using JVM or environment variables in location path. Especially a problem on Windows.
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 18:49:57 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135364,1139163,1143925
+/camel/trunk:1083696,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1139163,1143925
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java?rev=1143968&r1=1143967&r2=1143968&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java Thu Jul 7 18:49:57 2011
@@ -169,6 +169,8 @@ public class PropertiesComponent extends
if (ObjectHelper.isEmpty(value)) {
throw new IllegalArgumentException("Cannot find system environment with key: " + key);
}
+ // must quoute the replacement to have it work as literal replacement
+ value = Matcher.quoteReplacement(value);
location = matcher.replaceFirst(value);
// must match again as location is changed
matcher = ENV_PATTERN.matcher(location);
@@ -181,6 +183,8 @@ public class PropertiesComponent extends
if (ObjectHelper.isEmpty(value)) {
throw new IllegalArgumentException("Cannot find JVM system property with key: " + key);
}
+ // must quoute the replacement to have it work as literal replacement
+ value = Matcher.quoteReplacement(value);
location = matcher.replaceFirst(value);
// must match again as location is changed
matcher = SYS_PATTERN.matcher(location);