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 2016/10/24 14:00:36 UTC
[2/2] qpid-jms git commit: QPIDJMS-215: avoid shadowing properties,
rename headers too for clarity
QPIDJMS-215: avoid shadowing properties, rename headers too for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/7f8d10bf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/7f8d10bf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/7f8d10bf
Branch: refs/heads/master
Commit: 7f8d10bf1047bbe4af3807c1884aa24124bb1a46
Parents: 4259990
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 24 12:44:40 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 24 12:44:40 2016 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacade.java | 49 ++++++++++----------
1 file changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7f8d10bf/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 467c023..13cf307 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
@@ -279,34 +279,35 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
if (header != null) {
- Header headers = new Header();
- headers.setDurable(header.getDurable());
- headers.setPriority(header.getPriority());
- headers.setTtl(header.getTtl());
- headers.setFirstAcquirer(header.getFirstAcquirer());
- headers.setDeliveryCount(header.getDeliveryCount());
+ Header targetHeader = new Header();
- target.setHeader(headers);
+ targetHeader.setDurable(header.getDurable());
+ targetHeader.setPriority(header.getPriority());
+ targetHeader.setTtl(header.getTtl());
+ targetHeader.setFirstAcquirer(header.getFirstAcquirer());
+ targetHeader.setDeliveryCount(header.getDeliveryCount());
+
+ target.setHeader(targetHeader);
}
if (properties != null) {
- Properties properties = new Properties();
-
- properties.setMessageId(getProperties().getMessageId());
- properties.setUserId(getProperties().getUserId());
- properties.setTo(getProperties().getTo());
- properties.setSubject(getProperties().getSubject());
- properties.setReplyTo(getProperties().getReplyTo());
- properties.setCorrelationId(getProperties().getCorrelationId());
- properties.setContentType(getProperties().getContentType());
- properties.setContentEncoding(getProperties().getContentEncoding());
- properties.setAbsoluteExpiryTime(getProperties().getAbsoluteExpiryTime());
- properties.setCreationTime(getProperties().getCreationTime());
- properties.setGroupId(getProperties().getGroupId());
- properties.setGroupSequence(getProperties().getGroupSequence());
- properties.setReplyToGroupId(getProperties().getReplyToGroupId());
-
- target.setProperties(properties);
+ Properties targetProperties = new Properties();
+
+ targetProperties.setMessageId(properties.getMessageId());
+ targetProperties.setUserId(properties.getUserId());
+ targetProperties.setTo(properties.getTo());
+ targetProperties.setSubject(properties.getSubject());
+ targetProperties.setReplyTo(properties.getReplyTo());
+ targetProperties.setCorrelationId(properties.getCorrelationId());
+ targetProperties.setContentType(properties.getContentType());
+ targetProperties.setContentEncoding(properties.getContentEncoding());
+ targetProperties.setAbsoluteExpiryTime(properties.getAbsoluteExpiryTime());
+ targetProperties.setCreationTime(properties.getCreationTime());
+ targetProperties.setGroupId(properties.getGroupId());
+ targetProperties.setGroupSequence(properties.getGroupSequence());
+ targetProperties.setReplyToGroupId(properties.getReplyToGroupId());
+
+ target.setProperties(targetProperties);
}
target.setBody(body);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org