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:28 UTC

[3/5] git commit: Additional check to filter out replyToGroupId if its an empty string also.

Additional check to filter out replyToGroupId if its an empty string
also.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/54029860
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/54029860
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/54029860

Branch: refs/heads/master
Commit: 540298601f1db8aac54a5d17c9394d00f32616d5
Parents: e705110
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Sep 25 16:31:20 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Sep 25 16:31:20 2014 -0400

----------------------------------------------------------------------
 .../amqp/message/AmqpJmsMessagePropertyIntercepter.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/54029860/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index 11d10a3..7af0a85 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -102,7 +102,7 @@ public class AmqpJmsMessagePropertyIntercepter {
 
             @Override
             public boolean propertyExists(AmqpJmsMessageFacade message) {
-                return message.getAmqpTimeToLive() != 0;
+                return message.hasUserSpecifiedTimeToLive();
             }
         });
         PROPERTY_INTERCEPTERS.put(JMS_AMQP_REPLY_TO_GROUP_ID, new PropertyIntercepter() {
@@ -122,7 +122,8 @@ public class AmqpJmsMessagePropertyIntercepter {
 
             @Override
             public boolean propertyExists(AmqpJmsMessageFacade message) {
-                return message.getReplyToGroupId() != null;
+                String replyToGroupId = message.getReplyToGroupId();
+                return replyToGroupId != null && !replyToGroupId.equals("");
             }
         });
         PROPERTY_INTERCEPTERS.put(JMS_AMQP_TYPED_ENCODING, new PropertyIntercepter() {
@@ -142,7 +143,6 @@ public class AmqpJmsMessagePropertyIntercepter {
                     throw new JMSException("Property " + JMS_AMQP_TYPED_ENCODING + " cannot be set from a " + value.getClass().getName() + ".");
                 }
 
-                // TODO - Finished Typed encoding work.
                 if (message instanceof AmqpJmsObjectMessageFacade) {
                     // ((AmqpJmsSerializedObjectMessageFacade) message)
                 } else {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org