Updated Branches: refs/heads/master 7d5f2f465 -> 7b002c732
[CAMEL-6499] - Copy of GenericFileMessage returns NULL from toString Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b002c73 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b002c73 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b002c73 Branch: refs/heads/master Commit: 7b002c732f021f624eb404965f54ac313afd82a3 Parents: 7d5f2f4 Author: Ashwin Karpe <aka...@apache.org> Authored: Mon Jul 1 16:17:57 2013 -0500 Committer: Ashwin Karpe <aka...@apache.org> Committed: Mon Jul 1 16:17:57 2013 -0500 ---------------------------------------------------------------------- .../component/file/GenericFileMessage.java | 5 ++- .../component/file/GenericFileMessageTest.java | 35 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7b002c73/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java index bcf1e1a..161e8e3 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java @@ -52,6 +52,9 @@ public class GenericFileMessage<T> extends DefaultMessage { @Override public String toString() { // only output the filename as body can be big - return file != null ? file.getFileName() : null; + if (file != null) { + return file.getFileName(); + } + return getClass().getName() + "@" + Integer.toHexString(hashCode()); } } http://git-wip-us.apache.org/repos/asf/camel/blob/7b002c73/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java b/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java new file mode 100644 index 0000000..86157bc --- /dev/null +++ b/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java @@ -0,0 +1,35 @@ +/** + * 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.file; + +import java.io.File; + +import org.apache.camel.ContextTestSupport; + +public class GenericFileMessageTest extends ContextTestSupport { + + public void testGenericMessageToStringConversion() throws Exception { + GenericFileMessage<File> message = new GenericFileMessage<File>(); + assertStringContains(message.toString(), "org.apache.camel.component.file.GenericFileMessage@"); + + GenericFile<File> file = new GenericFile<File>(); + file.setFileName("target/test.txt"); + file.setFile(new File("target/test.txt")); + message = new GenericFileMessage<File>(file); + assertEquals("target/test.txt", message.toString()); + } +}
