[jboss-cvs] JBoss Messaging SVN: r4751 - in branches/Branch_JBMESSAGING-1303: tests/src/org/jboss/messaging/tests/unit/core/server/impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-07-30 11:46:04 -0400 (Wed, 30 Jul 2008)
New Revision: 4751

Modified:
   branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
   branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
Log:
added missing tx.commit() in MessageReferenceImpl.cancel()

Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-07-30 15:24:58 UTC (rev 4750)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-07-30 15:46:04 UTC (rev 4751)
@@ -164,7 +164,7 @@
             tx.addAcknowledgement(this);   
          }       
          
-         // tx.commit();
+         tx.commit();
          
          return false;
       }

Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java	2008-07-30 15:24:58 UTC (rev 4750)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java	2008-07-30 15:46:04 UTC (rev 4751)
@@ -133,6 +133,7 @@
       messageReference.setDeliveryCount(1);
       SimpleString queueName = new SimpleString("queueName");
       queue.referenceCancelled();
+      queue.referenceAcknowledged(messageReference);
       EasyMock.expect(queue.getName()).andStubReturn(queueName);
       EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
       EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
@@ -169,6 +170,7 @@
       messageReference.setDeliveryCount(1);
       SimpleString queueName = new SimpleString("queueName");
       queue.referenceCancelled();
+      queue.referenceAcknowledged(messageReference);
       EasyMock.expect(queue.getName()).andStubReturn(queueName);
       EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
       EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);