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/26 18:15:47 UTC
[2/4] git commit: fix population of creation-time field of propertie
section, via sender using setJMSTimestamp
fix population of creation-time field of propertie section, via sender using setJMSTimestamp
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/ee8a4cbd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/ee8a4cbd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/ee8a4cbd
Branch: refs/heads/master
Commit: ee8a4cbdca8a66f0ce58b83f9d52458217efedd0
Parents: 9919d2f
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Sep 26 16:55:09 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Sep 26 17:15:15 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacade.java | 8 ++++----
.../amqp/message/AmqpJmsMessageFacadeTest.java | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ee8a4cbd/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 5eb5ede..6855b60 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
@@ -348,10 +348,10 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
@Override
public void setTimestamp(long timestamp) {
- if (message.getProperties() != null) {
- if (timestamp != 0) {
- message.setCreationTime(timestamp);
- } else {
+ if (timestamp != 0) {
+ message.setCreationTime(timestamp);
+ } else {
+ if (message.getProperties() != null) {
message.getProperties().setCreationTime(null);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ee8a4cbd/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 c536d90..d5a73e3 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
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.nio.ByteBuffer;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -75,8 +76,11 @@ public class AmqpJmsMessageFacadeTest {
return Mockito.mock(AmqpConnection.class);
}
+
// ====== AMQP Properties Section =======
+ // --- message-id and correlation-id ---
+
@Test
public void testGetCorrelationIdIsNullOnNewMessage() {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
@@ -405,6 +409,22 @@ public class AmqpJmsMessageFacadeTest {
return new Binary(idBytes);
}
+ // --- creation-time field ---
+
+ @Test
+ public void testSetCreationTimeOnNewNewMessage() {
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ assertNull("Expected null Properties section", amqpMessageFacade.getAmqpMessage().getProperties());
+
+ long expected = 1;
+ amqpMessageFacade.setTimestamp(expected);
+
+ assertEquals("Unexpected timestamp value", expected, amqpMessageFacade.getTimestamp());
+ assertEquals("Expected creation-time field to be set on new Properties section", new Date(expected), amqpMessageFacade.getAmqpMessage().getProperties().getCreationTime());
+ }
+
+
// ====== AMQP Message Facade copy() tests =======
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org