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 2014/09/29 18:27:05 UTC
[04/11] git commit: fix empty list initialization on new stream
message facades
fix empty list initialization on new stream message facades
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/88945f1c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/88945f1c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/88945f1c
Branch: refs/heads/master
Commit: 88945f1ce77cc51dbe97fbb79c7edf1cf41d4fee
Parents: 52e02b6
Author: Robert Gemmell <ro...@apache.org>
Authored: Sat Sep 27 17:41:17 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Sep 29 17:09:37 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsStreamMessageFacade.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/88945f1c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
index edf7ea0..0955aed 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
@@ -50,7 +50,7 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements
*/
public AmqpJmsStreamMessageFacade(AmqpConnection connection) {
super(connection);
- initializeEmptyList();
+ list = initializeEmptyList();
setAnnotation(JMS_MSG_TYPE, JMS_STREAM_MESSAGE);
}
@@ -69,12 +69,12 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements
Section body = getAmqpMessage().getBody();
if (body == null) {
- initializeEmptyList();
+ list = initializeEmptyList();
} else if (body instanceof AmqpValue) {
Object value = ((AmqpValue) body).getValue();
if (value == null) {
- initializeEmptyList();
+ list = initializeEmptyList();
} else if (value instanceof List) {
list = (List<Object>) value;
} else {
@@ -157,8 +157,10 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements
return list.isEmpty();
}
- private void initializeEmptyList() {
- List<Object> list = new ArrayList<Object>();
- message.setBody(new AmqpValue(list));
+ private List<Object> initializeEmptyList() {
+ List<Object> emptyList = new ArrayList<Object>();
+ message.setBody(new AmqpValue(emptyList));
+
+ return emptyList;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org