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:06 UTC
[05/11] git commit: stop application properties being overwritten
when retrieving the contents from the facade
stop application properties being overwritten when retrieving the contents from the facade
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/66bc0033
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/66bc0033
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/66bc0033
Branch: refs/heads/master
Commit: 66bc0033e0b0ee13da95202b706491af09c1fe29
Parents: 161bba6
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Sep 29 10:02:31 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Sep 29 17:09:37 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacade.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/66bc0033/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 8d1b774..5a514b8 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
@@ -151,7 +151,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
@Override
public Map<String, Object> getProperties() throws JMSException {
- lazyCreateProperties();
+ lazyCreateApplicationProperties();
return Collections.unmodifiableMap(new HashMap<String, Object>(applicationPropertiesMap));
}
@@ -204,10 +204,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
public void setApplicationProperty(String key, Object value) throws JMSException {
- if (applicationPropertiesMap == null) {
- lazyCreateProperties();
- }
-
+ lazyCreateApplicationProperties();
applicationPropertiesMap.put(key, value);
}
@@ -300,7 +297,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
if (applicationPropertiesMap != null) {
- target.lazyCreateProperties();
+ target.lazyCreateApplicationProperties();
target.applicationPropertiesMap.putAll(applicationPropertiesMap);
}
@@ -809,8 +806,10 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
- private void lazyCreateProperties() {
- applicationPropertiesMap = new HashMap<String,Object>();
- message.setApplicationProperties(new ApplicationProperties(applicationPropertiesMap));
+ private void lazyCreateApplicationProperties() {
+ if (applicationPropertiesMap == null) {
+ applicationPropertiesMap = new HashMap<String, Object>();
+ message.setApplicationProperties(new ApplicationProperties(applicationPropertiesMap));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org