Author: davsclaus
Date: Sun Jun 3 09:49:21 2012
New Revision: 1345640
URL: http://svn.apache.org/viewvc?rev=1345640&view=rev
Log:
CAMEL-3547: Added bridge property placeholder between Spring and Camel, to make
it easier to use Spring placeholders in Camel apps, without double
configuration.
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java?rev=1345640&r1=1345639&r2=1345640&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
Sun Jun 3 09:49:21 2012
@@ -65,11 +65,8 @@ public class BridgePropertyPlaceholderCo
}
}
}
- if (answer.isEmpty()) {
- return null;
- } else {
- return answer;
- }
+ // must not return null
+ return answer;
}
public void setResolver(PropertiesResolver resolver) {
