Author: davsclaus
Date: Wed Dec 10 12:41:13 2008
New Revision: 725424
URL: http://svn.apache.org/viewvc?rev=725424&view=rev
Log:
CAMEL-1155: Sorry James
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/AbstractCamelContextBeanDefinitionParaser.java
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=725424&r1=725423&r2=725424&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
Wed Dec 10 12:41:13 2008
@@ -51,10 +51,10 @@
if (context != null && endpoint.getMessageChannel() == null) {
channelResolver = new
BeanFactoryChannelResolver(context.getApplicationContext());
inputChannelName = endpoint.getDefaultChannel();
- if (ObjectHelper.isNullOrBlank(inputChannelName)) {
+ if (ObjectHelper.isEmpty(inputChannelName)) {
inputChannelName = endpoint.getInputChannel();
}
- if (!ObjectHelper.isNullOrBlank(inputChannelName)) {
+ if (!ObjectHelper.isEmpty(inputChannelName)) {
inputChannel = (DirectChannel)
channelResolver.resolveChannelName(inputChannelName);
ObjectHelper.notNull(inputChannel, "The inputChannel with the
name [" + inputChannelName + "]");
} else {
@@ -108,7 +108,7 @@
// using the outputChannel
reply = outputChannel;
} else {
- if
(ObjectHelper.isNullOrBlank(endpoint.getOutputChannel())) {
+ if (ObjectHelper.isEmpty(endpoint.getOutputChannel())) {
outputChannel = (MessageChannel)
channelResolver.resolveChannelName(endpoint.getOutputChannel());
ObjectHelper.notNull(inputChannel, "The outputChannel
with the name [" + endpoint.getOutputChannel() + "]");
reply = outputChannel;
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=725424&r1=725423&r2=725424&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
Wed Dec 10 12:41:13 2008
@@ -61,10 +61,10 @@
if (context != null && endpoint.getMessageChannel() == null) {
outputChannelName = endpoint.getDefaultChannel();
channelResolver = new
BeanFactoryChannelResolver(context.getApplicationContext());
- if (ObjectHelper.isNullOrBlank(outputChannelName)) {
+ if (ObjectHelper.isEmpty(outputChannelName)) {
outputChannelName = endpoint.getInputChannel();
}
- if (ObjectHelper.isNullOrBlank(outputChannelName)) {
+ if (ObjectHelper.isEmpty(outputChannelName)) {
throw new RuntimeCamelException("Can't find the right
outputChannelName, "
+ "please check the endpoint
uri outputChannel part!");
} else {
@@ -80,7 +80,7 @@
if (endpoint.isInOut()) {
endpoint.setExchangePattern(ExchangePattern.InOut);
// we need to setup right inputChannel for further processing
- if (ObjectHelper.isNullOrBlank(endpoint.getInputChannel())) {
+ if (ObjectHelper.isEmpty(endpoint.getInputChannel())) {
throw new RuntimeCamelException("Can't find the right
inputChannel, "
+ "please check the endpoint
uri inputChannel part!");
} else {
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/AbstractCamelContextBeanDefinitionParaser.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/AbstractCamelContextBeanDefinitionParaser.java?rev=725424&r1=725423&r2=725424&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/AbstractCamelContextBeanDefinitionParaser.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/config/AbstractCamelContextBeanDefinitionParaser.java
Wed Dec 10 12:41:13 2008
@@ -42,7 +42,7 @@
private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext";
private String getContextId(String contextId) {
- if (ObjectHelper.isNullOrBlank(contextId)) {
+ if (ObjectHelper.isEmpty(contextId)) {
//Set the contextId default value here
return DEFAULT_CAMEL_CONTEXT_NAME;
} else {
