Author: davsclaus
Date: Fri Apr 27 07:55:12 2012
New Revision: 1331277
URL: http://svn.apache.org/viewvc?rev=1331277&view=rev
Log:
CAMEL-5229: Property placeholders using blueprint, should avoid setting empty
locations by default
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1331273
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=1331277&r1=1331276&r2=1331277&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
Fri Apr 27 07:55:12 2012
@@ -219,8 +219,10 @@ public class CamelContextFactoryBean ext
for (String id : ids) {
sb.append("blueprint:").append(id).append(",");
}
- // location supports multiple separated by comma
- pc.setLocation(sb.toString());
+ if (sb.length() > 0) {
+ // location supports multiple separated by comma
+ pc.setLocation(sb.toString());
+ }
}
if (pc.getLocations() != null) {
