remove field to simplify handling of message annotations section
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e338b4ef Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e338b4ef Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e338b4ef Branch: refs/heads/master Commit: e338b4ef45dc4042e33d6fcfb5e9ebe83ad93f02 Parents: f315bd3 Author: Robert Gemmell <[email protected]> Authored: Wed Oct 8 09:38:54 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Wed Oct 8 12:28:34 2014 +0100 ---------------------------------------------------------------------- .../jms/provider/amqp/message/AmqpJmsMessageFacade.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e338b4ef/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java index b23661b..ffaa165 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java @@ -62,7 +62,6 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { protected final Message message; protected final AmqpConnection connection; - private MessageAnnotations mesageAnnotations; private Map<Symbol,Object> messageAnnotationsMap; private Map<String,Object> applicationPropertiesMap; @@ -107,9 +106,8 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { this.connection = consumer.getConnection(); this.consumerDestination = consumer.getDestination(); - mesageAnnotations = message.getMessageAnnotations(); - if (mesageAnnotations != null) { - messageAnnotationsMap = mesageAnnotations.getValue(); + if (message.getMessageAnnotations() != null) { + messageAnnotationsMap = message.getMessageAnnotations().getValue(); } if (message.getApplicationProperties() != null) { @@ -827,7 +825,6 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { */ void clearMessageAnnotations() { messageAnnotationsMap = null; - mesageAnnotations = null; message.setMessageAnnotations(null); } @@ -892,8 +889,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { private void lazyCreateMessageAnnotations() { if (messageAnnotationsMap == null) { messageAnnotationsMap = new HashMap<Symbol,Object>(); - mesageAnnotations = new MessageAnnotations(messageAnnotationsMap); - message.setMessageAnnotations(mesageAnnotations); + message.setMessageAnnotations(new MessageAnnotations(messageAnnotationsMap)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
