Repository: qpid-jms
Updated Branches:
  refs/heads/master 4723c5a1f -> 5c99fafaf


update JMSXGroupSeq interceptor propertyExists handling


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

Branch: refs/heads/master
Commit: cbf246415cae13176aad9ac565e462ce95eaf784
Parents: 4723c5a
Author: Robert Gemmell <[email protected]>
Authored: Tue Oct 7 12:22:41 2014 +0100
Committer: Robert Gemmell <[email protected]>
Committed: Tue Oct 7 12:22:41 2014 +0100

----------------------------------------------------------------------
 .../org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java | 2 +-
 .../apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cbf24641/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
index 9f703a0..299bfb4 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
@@ -386,7 +386,7 @@ public class JmsMessagePropertyIntercepter {
 
             @Override
             public boolean propertyExists(JmsMessageFacade message) {
-                return message.getGroupId() != null;
+                return message.getGroupSequence() != 0;
             }
         });
         PROPERTY_INTERCEPTERS.put(JMSX_USERID, new PropertyIntercepter() {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cbf24641/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index e9ad243..96ade98 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -572,7 +572,7 @@ public class JmsMessagePropertyIntercepterTest {
     @Test
     public void testJMSXGroupSeqInGetPropertyNamesWhenSet() throws 
JMSException {
         JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
-        Mockito.when(message.getGroupId()).thenReturn("GROUP_ID");
+        Mockito.when(message.getGroupSequence()).thenReturn(1);
         
assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_GROUPSEQ));
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to