[jboss-cvs] JBoss Messaging SVN: r7968 - branches/Branch_1_4/src/main/org/jboss/messaging/core/impl.

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

Author: gaohoward
Date: 2010-03-04 12:40:55 -0500 (Thu, 04 Mar 2010)
New Revision: 7968

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
Log:
JBMESSAGING-1786


Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2010-03-04 10:07:01 UTC (rev 7967)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2010-03-04 17:40:55 UTC (rev 7968)
@@ -43,7 +43,7 @@
 import org.jboss.messaging.core.contract.PersistenceManager;
 import org.jboss.messaging.core.impl.tx.Transaction;
 import org.jboss.messaging.core.impl.tx.TransactionException;
-import org.jboss.messaging.core.impl.tx.TxCallback;
+import org.jboss.messaging.core.impl.tx.TxCallbackEx;
 import org.jboss.messaging.util.prioritylinkedlist.BasicPriorityLinkedList;
 import org.jboss.messaging.util.prioritylinkedlist.PriorityLinkedList;
 import org.jboss.util.timeout.Timeout;
@@ -957,7 +957,7 @@
 
    // Inner classes --------------------------------------------------------------------------------
 
-   private class InMemoryCallback implements TxCallback
+   private class InMemoryCallback implements TxCallbackEx
    {
       private List refsToAdd;
 
@@ -1088,17 +1088,21 @@
 
       public void afterRollbackEx(boolean onePhase, boolean isRecovered) throws Exception
       {
+         log.error("----xxxx---- afterRollbackEx, onePhase: " + onePhase + " isrecoverd: " + isRecovered);
+         
          if (!isRecovered)
          {
             return;
          }
       
          boolean performDelivery = false;
+
          for(Iterator i = deliveriesToRemove.iterator(); i.hasNext(); )
          {
             Delivery del = (Delivery)i.next();
       
             MessageReference ref = del.getReference();
+            log.error("----xxxx---- afterRollbackEx, got ref: " + ref);
       
             if (checkAndSchedule(ref))
             {
@@ -1112,6 +1116,7 @@
                   {
                      synchronized (lock)
                      {
+                        log.error("----xxxx---- afterRollbackEx, add back ref: " + ref);
                         addReferenceInMemory(ref);
                         performDelivery = true;
                      }
@@ -1121,10 +1126,13 @@
                      throw new TransactionException("Failed to add reference", t);
                   }
                   deliveringCount.decrement();
+                  log.error("----xxxx---- afterRollbackEx, now count: " + deliveringCount);
                }
             }
          }
-               
+
+         log.error("----xxxx---- afterRollbackEx, performDelivery: " + performDelivery);
+
          if (performDelivery)
          {
             synchronized (lock)