Author: davsclaus
Date: Thu Jul 30 15:32:20 2009
New Revision: 799332
URL: http://svn.apache.org/viewvc?rev=799332&view=rev
Log:
CAMEL-1865: Fixed NPE when logging message when its a copy and it have not
assigned an Exchange.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=799332&r1=799331&r2=799332&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
Thu Jul 30 15:32:20 2009
@@ -126,9 +126,11 @@
// default to 1000 chars
int length = 1000;
- String property =
message.getExchange().getContext().getProperties().get(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
- if (property != null) {
- length =
message.getExchange().getContext().getTypeConverter().convertTo(Integer.class,
property);
+ if (message.getExchange() != null) {
+ String property =
message.getExchange().getContext().getProperties().get(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ if (property != null) {
+ length =
message.getExchange().getContext().getTypeConverter().convertTo(Integer.class,
property);
+ }
}
Object obj = message.getBody();
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java?rev=799332&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
Thu Jul 30 15:32:20 2009
@@ -0,0 +1,81 @@
+/**
+ * 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.issues;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ * @version $Revision$
+ */
+public class SplitterUsingBeanReturningMessageTest extends ContextTestSupport {
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("mySplitter", new MyOtherSplitterBean());
+ return jndi;
+ }
+
+ public static class MyOtherSplitterBean {
+ public List split(Exchange exchange) {
+
+ Message in = exchange.getIn();
+ assertNotNull(in.toString());
+
+ List<Message> msgs = new LinkedList<Message>();
+
+ Message copy = in.copy();
+ assertNotNull(copy.toString());
+
+ copy.setBody("not empty");
+ copy.setHeader("type", "TYPE1");
+ msgs.add(copy);
+
+ return msgs;
+ }
+ }
+
+ public void testSplitWithMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isEqualTo("not empty");
+ mock.message(0).header("type").isEqualTo("TYPE1");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .split().method("mySplitter").to("log:foo", "mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
