svn commit: r648666 - in /incubator/qpid/branches/M2.1/java/client/src: main/java/org/apache/qpid/client/AMQSession.java test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java

[rgodfrey]

Author: rgodfrey
Date: Wed Apr 16 04:20:13 2008
New Revision: 648666

URL: http://svn.apache.org/viewvc?rev=648666&view=rev
Log:
QPID-931 : Always use exclusive consumers when subscribing to topics

Modified:
    
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java

Modified: 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=648666&r1=648665&r2=648666&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 Wed Apr 16 04:20:13 2008
@@ -858,7 +858,7 @@
     {
         checkValidDestination(destination);
 
-        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, false, false, null, null,
+        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, false, (destination instanceof Topic), null, null,
                                   false, false);
     }
 
@@ -876,7 +876,7 @@
     {
         checkValidDestination(destination);
 
-        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, false, false,
+        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, false, (destination instanceof Topic),
                                   messageSelector, null, false, false);
     }
 
@@ -885,7 +885,7 @@
     {
         checkValidDestination(destination);
 
-        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, noLocal, false,
+        return createConsumerImpl(destination, _defaultPrefetchHighMark, 
_defaultPrefetchLowMark, noLocal, (destination instanceof Topic),
                                   messageSelector, null, false, false);
     }
 

Modified: 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=648666&r1=648665&r2=648666&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
 Wed Apr 16 04:20:13 2008
@@ -79,7 +79,7 @@
         TopicSubscriber subscriber = _session.createDurableSubscriber(_topic, 
"mysubname");
         assertEquals("Topic names should match from durable TopicSubscriber", 
_topic.getTopicName(), subscriber.getTopic().getTopicName());
 
-        subscriber = _session.createDurableSubscriber(_topic, "mysubname", 
"abc", false);
+        subscriber = _session.createDurableSubscriber(_topic, "mysubname2", 
"abc", false);
         assertEquals("Topic names should match from durable TopicSubscriber 
with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName());
     }