[Jboss-cvs] JBossAS SVN: r57040 - trunk/messaging/src/main/org/jboss/mq/server

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

Author: adrian at jboss.org
Date: 2006-09-21 01:03:52 -0400 (Thu, 21 Sep 2006)
New Revision: 57040

Modified:
   trunk/messaging/src/main/org/jboss/mq/server/BasicQueue.java
Log:
[JBAS-3628] - Complete the fix for JBAS-3573

Modified: trunk/messaging/src/main/org/jboss/mq/server/BasicQueue.java
===================================================================
--- trunk/messaging/src/main/org/jboss/mq/server/BasicQueue.java	2006-09-21 05:02:30 UTC (rev 57039)
+++ trunk/messaging/src/main/org/jboss/mq/server/BasicQueue.java	2006-09-21 05:03:52 UTC (rev 57040)
@@ -631,9 +631,9 @@
       // Was it a negative acknowledge??
       if (!item.isAck)
       {
-         Runnable task;
-         task = new RestoreMessageTask(m);
+         Runnable task = new RestoreMessageTask(m);
          server.getPersistenceManager().getTxManager().addPostCommitTask(txId, task);
+         server.getPersistenceManager().getTxManager().addPostRollbackTask(txId, task);
       }
       else
       {
@@ -648,6 +648,7 @@
             // force a NACK with a rollback/error
             Runnable task = new RestoreMessageTask(m);
             server.getPersistenceManager().getTxManager().addPostCommitTask(txId, task);
+            server.getPersistenceManager().getTxManager().addPostRollbackTask(txId, task);
             SpyJMSException.rethrowAsJMSException("Error during ACK ref=" + m, t);
          }