You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2007/02/15 22:15:01 UTC

svn commit: r508150 - in /incubator/qpid/branches/qpid.0-9/java: broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java

Author: kpvdr
Date: Thu Feb 15 13:15:01 2007
New Revision: 508150

URL: http://svn.apache.org/viewvc?view=rev&rev=508150
Log:
Fix for messages that stick around in unsubscribed queues after rollback

Modified:
    incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
    incubator/qpid/branches/qpid.0-9/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java

Modified: incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java?view=diff&rev=508150&r1=508149&r2=508150
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java Thu Feb 15 13:15:01 2007
@@ -69,6 +69,11 @@
             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 void rollback() throws AMQException
     {
         _txnBuffer.rollback(_storeContext);
+        _postCommitDeliveryList.clear();
     }
 
     public void deliver(AMQMessage message, AMQQueue queue) throws AMQException

Modified: incubator/qpid/branches/qpid.0-9/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?view=diff&rev=508150&r1=508149&r2=508150
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Thu Feb 15 13:15:01 2007
@@ -59,7 +59,7 @@
         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 @@
     // 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));
     }