Fix for messages that stick around in unsubscribed queues after rollback

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@508150 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 2 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
index d750ee7f72..73485d2c20 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
@@ -69,6 +69,11 @@ public class LocalTransactionalContext implements TransactionalContext
             this.message = message;
             this.queue = queue;
         }
+        
+        public String toString()
+        {
+            return "msg=" + message.getBody() + "; q=" + queue.getName();
+        }
     }
 
     public LocalTransactionalContext(MessageStore messageStore, StoreContext storeContext,
@@ -89,6 +94,7 @@ public class LocalTransactionalContext implements TransactionalContext
     public void rollback() throws AMQException
     {
         _txnBuffer.rollback(_storeContext);
+        _postCommitDeliveryList.clear();
     }
 
     public void deliver(AMQMessage message, AMQQueue queue) throws AMQException
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index 456763bba0..0f5321167c 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
@@ -59,7 +59,7 @@ public class TransactedTest extends TestCase
         super.setUp();
         TransportConnection.createVMBroker(1);
         queue1 = new AMQQueue(new AMQShortString("Q1"), new AMQShortString("Q1"), false, true);
-        queue2 = new AMQQueue("Q2x", false);
+        queue2 = new AMQQueue("Q2", false);
 
         con = new AMQConnection("vm://:1", "guest", "guest", "TransactedTest", "test");
         session = con.createSession(true, 0);
@@ -167,7 +167,6 @@ public class TransactedTest extends TestCase
     // messages left over from the last test (which can affect later tests)...
     public void testEmpty2() throws Exception
     {
-//System.out.println("=== DEBUG === testEmpty2(): assertTrue(null == consumer1.receive(1000));");
         assertTrue(null == consumer1.receive(1000));
     }