You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/11/11 13:32:27 UTC
[2/3] camel git commit: Camel-8024 Polished the code and fixed some
minor issues
Camel-8024 Polished the code and fixed some minor issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91411e1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91411e1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91411e1c
Branch: refs/heads/master
Commit: 91411e1c932b2cf9a6dd60e9a3e94f381cf94565
Parents: 3cf9f7b
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 11 17:12:28 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 11 20:32:12 2014 +0800
----------------------------------------------------------------------
.../camel/component/sjms/jms/JmsMessageHelper.java | 2 +-
.../JMSMessageHelperTypeConversionTest.java | 11 ++---------
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/91411e1c/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index 5934966..79c57be 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -385,7 +385,7 @@ public final class JmsMessageHelper {
} else if (Collection.class.isInstance(payload)) {
answer = JmsMessageType.Map;
} else if (InputStream.class.isInstance(payload)) {
- answer = JmsMessageType.Bytes;
+ answer = JmsMessageType.Stream;
} else if (ByteBuffer.class.isInstance(payload)) {
answer = JmsMessageType.Bytes;
} else if (File.class.isInstance(payload)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/91411e1c/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/typeconversion/JMSMessageHelperTypeConversionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/typeconversion/JMSMessageHelperTypeConversionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/typeconversion/JMSMessageHelperTypeConversionTest.java
index 11c7995..ab5d0ef 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/typeconversion/JMSMessageHelperTypeConversionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/typeconversion/JMSMessageHelperTypeConversionTest.java
@@ -21,21 +21,14 @@ import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintStream;
import java.io.Reader;
import java.io.StringReader;
import java.nio.ByteBuffer;
-import javax.jms.BytesMessage;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-
-import org.apache.activemq.command.ActiveMQBytesMessage;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -61,7 +54,7 @@ public class JMSMessageHelperTypeConversionTest extends JmsTestSupport {
public void testJMSMessageHelperInputStream() throws Exception {
getMockEndpoint(MOCK_RESULT_URI).expectedBodiesReceived("Hello Camel");
String p = "Hello Camel";
- InputStream is = new ByteArrayInputStream( p.getBytes() );
+ InputStream is = new ByteArrayInputStream(p.getBytes());
template.sendBody(SJMS_QUEUE_URI, is);
assertMockEndpointsSatisfied();
assertTrue(byte[].class.isInstance(message.getIn().getBody()));
@@ -139,7 +132,7 @@ public class JMSMessageHelperTypeConversionTest extends JmsTestSupport {
@Test
public void testJMSMessageHelperCharArray() throws InterruptedException, FileNotFoundException {
getMockEndpoint(MOCK_RESULT_URI).expectedBodiesReceived("Hello Camel");
- char[] p = {'H','e','l','l','o',' ','C','a','m','e','l'};
+ char[] p = {'H', 'e', 'l', 'l', 'o', ' ', 'C', 'a', 'm', 'e', 'l'};
template.sendBody(SJMS_QUEUE_URI, p);
assertMockEndpointsSatisfied();
assertTrue(String.class.isInstance(message.getIn().getBody()));