You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/10/08 15:36:39 UTC
qpid-jms git commit: QPIDJMS-105: fix re-indentation missed in last
commit, remove a non-test
Repository: qpid-jms
Updated Branches:
refs/heads/master 2c550d767 -> f6e5460e3
QPIDJMS-105: fix re-indentation missed in last commit, remove a non-test
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f6e5460e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f6e5460e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f6e5460e
Branch: refs/heads/master
Commit: f6e5460e335213569fec763b347c7b2e8c1b4e9c
Parents: 2c550d7
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Oct 8 14:36:02 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Oct 8 14:36:02 2015 +0100
----------------------------------------------------------------------
.../jms/message/JmsMessageTransformation.java | 104 +++++++++----------
.../message/JmsMessageTransformationTest.java | 5 -
2 files changed, 52 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f6e5460e/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
index c270f18..1beae38 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
@@ -109,66 +109,66 @@ public final class JmsMessageTransformation {
* @throws JMSException if an error occurs during the transform.
*/
public static JmsMessage transformMessage(JmsConnection connection, Message message) throws JMSException {
- JmsMessage jmsMessage = null;
- JmsMessageFactory factory = connection.getMessageFactory();
-
- if (message instanceof BytesMessage) {
- BytesMessage bytesMsg = (BytesMessage) message;
- bytesMsg.reset();
- JmsBytesMessage msg = factory.createBytesMessage();
- try {
- for (;;) {
- // Reads a byte from the message stream until the stream is empty
- msg.writeByte(bytesMsg.readByte());
- }
- } catch (MessageEOFException e) {
- // Indicates all the bytes have been read from the source.
+ JmsMessage jmsMessage = null;
+ JmsMessageFactory factory = connection.getMessageFactory();
+
+ if (message instanceof BytesMessage) {
+ BytesMessage bytesMsg = (BytesMessage) message;
+ bytesMsg.reset();
+ JmsBytesMessage msg = factory.createBytesMessage();
+ try {
+ for (;;) {
+ // Reads a byte from the message stream until the stream is empty
+ msg.writeByte(bytesMsg.readByte());
}
+ } catch (MessageEOFException e) {
+ // Indicates all the bytes have been read from the source.
+ }
- jmsMessage = msg;
- } else if (message instanceof MapMessage) {
- MapMessage mapMsg = (MapMessage) message;
- JmsMapMessage msg = factory.createMapMessage();
- Enumeration<?> iter = mapMsg.getMapNames();
+ jmsMessage = msg;
+ } else if (message instanceof MapMessage) {
+ MapMessage mapMsg = (MapMessage) message;
+ JmsMapMessage msg = factory.createMapMessage();
+ Enumeration<?> iter = mapMsg.getMapNames();
- while (iter.hasMoreElements()) {
- String name = iter.nextElement().toString();
- msg.setObject(name, mapMsg.getObject(name));
- }
+ while (iter.hasMoreElements()) {
+ String name = iter.nextElement().toString();
+ msg.setObject(name, mapMsg.getObject(name));
+ }
- jmsMessage = msg;
- } else if (message instanceof ObjectMessage) {
- ObjectMessage objMsg = (ObjectMessage) message;
- JmsObjectMessage msg = factory.createObjectMessage();
- msg.setObject(objMsg.getObject());
- jmsMessage = msg;
- } else if (message instanceof StreamMessage) {
- StreamMessage streamMessage = (StreamMessage) message;
- streamMessage.reset();
- JmsStreamMessage msg = factory.createStreamMessage();
- Object obj = null;
-
- try {
- while ((obj = streamMessage.readObject()) != null) {
- msg.writeObject(obj);
- }
- } catch (MessageEOFException e) {
- // Indicates all the stream values have been read from the source.
+ jmsMessage = msg;
+ } else if (message instanceof ObjectMessage) {
+ ObjectMessage objMsg = (ObjectMessage) message;
+ JmsObjectMessage msg = factory.createObjectMessage();
+ msg.setObject(objMsg.getObject());
+ jmsMessage = msg;
+ } else if (message instanceof StreamMessage) {
+ StreamMessage streamMessage = (StreamMessage) message;
+ streamMessage.reset();
+ JmsStreamMessage msg = factory.createStreamMessage();
+ Object obj = null;
+
+ try {
+ while ((obj = streamMessage.readObject()) != null) {
+ msg.writeObject(obj);
}
-
- jmsMessage = msg;
- } else if (message instanceof TextMessage) {
- TextMessage textMsg = (TextMessage) message;
- JmsTextMessage msg = factory.createTextMessage();
- msg.setText(textMsg.getText());
- jmsMessage = msg;
- } else {
- jmsMessage = factory.createMessage();
+ } catch (MessageEOFException e) {
+ // Indicates all the stream values have been read from the source.
}
- copyProperties(connection, message, jmsMessage);
+ jmsMessage = msg;
+ } else if (message instanceof TextMessage) {
+ TextMessage textMsg = (TextMessage) message;
+ JmsTextMessage msg = factory.createTextMessage();
+ msg.setText(textMsg.getText());
+ jmsMessage = msg;
+ } else {
+ jmsMessage = factory.createMessage();
+ }
+
+ copyProperties(connection, message, jmsMessage);
- return jmsMessage;
+ return jmsMessage;
}
/**
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f6e5460e/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
index fcbd93d..1c63d50 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
@@ -55,11 +55,6 @@ public class JmsMessageTransformationTest {
private static final String DESTINATION_NAME = "Test-Destination-Name";
- @Test
- public void testJmsDestinationCreate() throws JMSException {
- new JmsMessageTransformation();
- }
-
//---------- Test Message Transformation ---------------------------------//
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org