You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/09/26 00:45:29 UTC
[4/5] git commit: Test for number of message properties and fix copy
incorrectly mapping replyTo into the replyToGroupId feild.
Test for number of message properties and fix copy incorrectly mapping
replyTo into the replyToGroupId feild.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0546ace6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0546ace6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0546ace6
Branch: refs/heads/master
Commit: 0546ace6ea8f9611b898e480d92996cb765b025e
Parents: 5402986
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Sep 25 16:50:50 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Sep 25 16:50:50 2014 -0400
----------------------------------------------------------------------
.../jms/provider/amqp/message/AmqpJmsMessageFacade.java | 8 ++++++--
.../provider/amqp/message/AmqpJmsMessageFacadeTest.java | 12 ++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0546ace6/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 5e04f99..c0d4d9f 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
@@ -282,7 +282,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
properties.setCreationTime(message.getProperties().getCreationTime());
properties.setGroupId(message.getProperties().getGroupId());
properties.setGroupSequence(message.getProperties().getGroupSequence());
- properties.setReplyToGroupId(message.getProperties().getReplyTo());
+ properties.setReplyToGroupId(message.getProperties().getReplyToGroupId());
targetMsg.setProperties(properties);
}
@@ -561,8 +561,12 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
+ public boolean hasUserSpecifiedTimeToLive() {
+ return userSpecifiedTTL != null;
+ }
+
public long getAmqpTimeToLive() {
- return userSpecifiedTTL;
+ return userSpecifiedTTL != null ? userSpecifiedTTL : 0;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0546ace6/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index 8ae2a39..a1247a1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -406,6 +406,15 @@ public class AmqpJmsMessageFacadeTest {
return new Binary(idBytes);
}
+ // ====== AMQP Message Facade copy() tests =======
+
+ @Test
+ public void testCopyOfEmptyMessageSucceeds() throws JMSException {
+ AmqpJmsMessageFacade empty = createNewMessageFacade();
+ AmqpJmsMessageFacade copy = empty.copy();
+ assertNotNull(copy);
+ }
+
@Test
public void testBasicMessageCopy() throws JMSException {
AmqpJmsMessageFacade source = createNewMessageFacade();
@@ -450,6 +459,9 @@ public class AmqpJmsMessageFacadeTest {
assertEquals(source.getTimestamp(), copy.getTimestamp());
assertEquals(source.getUserId(), copy.getUserId());
+ // There should be two since none of the extended options were set
+ assertEquals(2, copy.getPropertyNames().size());
+
assertNotNull(copy.getProperty("APP-Prop-1"));
assertNotNull(copy.getProperty("APP-Prop-2"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org