camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/6] git commit: CAMEL-7429 Fix issue preventing from redefining property values
Date Thu, 19 Jun 2014 07:17:38 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 23bb1758a -> 76784069f
  refs/heads/camel-2.13.x 5b4cceb0b -> 7f78ed9ff
  refs/heads/master 5ba767e1b -> 9b7cc6b5c


CAMEL-7429 Fix issue preventing from redefining property values


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

Branch: refs/heads/camel-2.12.x
Commit: 76784069fce0e041affa0b011b25bb8cc085b265
Parents: 893a0e5
Author: Antoine DESSAIGNE <antoine.dessaigne@gmail.com>
Authored: Thu Jun 19 09:01:44 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Jun 19 09:17:06 2014 +0200

----------------------------------------------------------------------
 .../apache/camel/component/properties/DefaultPropertiesParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/76784069/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
index 1ee227a..7d25e8d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
@@ -242,7 +242,7 @@ public class DefaultPropertiesParser implements AugmentedPropertyNameAwareProper
             } else if (properties != null) {
                 value = properties.getProperty(key);
             }
-            return value;
+            return parseProperty(key, value, properties);
         }
     }
 


Mime
View raw message