summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2007-10-08 12:46:57 +0000
committerArnaud Simon <arnaudsimon@apache.org>2007-10-08 12:46:57 +0000
commitf77e3fc9579aa4041b08c8181cb7b951d04f0002 (patch)
tree9454cbf8eb7f7d9d5dc232a8d7f1e22c1f5407d5 /java/client
parent56f678f423f49dff9a79f3f6a0660f00e7da5cc3 (diff)
downloadqpid-python-f77e3fc9579aa4041b08c8181cb7b951d04f0002.tar.gz
fixed issue with temporary queues as the consumer was not closed when cancel operation returned
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@582806 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java2
-rw-r--r--java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index b4fdddce60..09895b7520 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -172,6 +172,8 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
{
((AMQSession_0_10) getSession()).getQpidSession().messageStop(getConsumerTag().toString());
((AMQSession_0_10) getSession()).getQpidSession().sync();
+ // confirm cancel
+ getSession().confirmConsumerCancelled(getConsumerTag());
try
{
((AMQSession_0_10) getSession()).getCurrentException();
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
index 549f60112e..34197f2608 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
@@ -42,12 +42,11 @@ public class TemporaryQueueTest extends QpidTestCase
protected void setUp() throws Exception
{
super.setUp();
- TransportConnection.createVMBroker(1);
}
protected void tearDown() throws Exception
{
- TransportConnection.killAllVMBrokers();
+ super.tearDown();
}
protected Connection createConnection() throws Exception