Author: davsclaus
Date: Wed Oct 21 06:45:04 2009
New Revision: 827902
URL: http://svn.apache.org/viewvc?rev=827902&view=rev
Log:
CAMEL-2088: Fixed issue with null Strings being converted to a log message.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java?rev=827902&r1=827901&r2=827902&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java Wed Oct 21 06:45:04 2009
@@ -19,6 +19,7 @@
import java.util.concurrent.Future;
import org.apache.camel.Exchange;
+import org.apache.camel.Message;
import org.apache.camel.TypeConverter;
import org.apache.camel.component.file.GenericFile;
@@ -34,6 +35,11 @@
public <T> T convertTo(Class<T> toType, Object value) {
if (value != null) {
+ // should not try to convert Message
+ if (Message.class.isAssignableFrom(value.getClass())) {
+ return (T) Void.TYPE;
+ }
+
// should not try to convert future
if (Future.class.isAssignableFrom(value.getClass())) {
return (T) Void.TYPE;
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java?rev=827902&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java Wed Oct 21 06:45:04 2009
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.bean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ * @version $Revision$
+ */
+public class BeanInvokeWithNullBodyTest extends ContextTestSupport {
+
+ public void testWithHelloWorld() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testWithEmptyBody() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("");
+
+ template.sendBody("direct:start", "");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testWithNullBody() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ getMockEndpoint("mock:result").message(0).body().isNull();
+
+ template.sendBody("direct:start", null);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("foo", new MyNullFooBean());
+ return jndi;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("bean:foo").to("mock:result");
+ }
+ };
+ }
+
+ private class MyNullFooBean {
+
+ public String doSomething(String s) {
+ return s;
+ }
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date