[hornetq-commits] JBoss hornetq SVN: r10913 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/persistence/impl/journal.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-07-01 14:19:25 -0400 (Fri, 01 Jul 2011)
New Revision: 10913

Modified:
   branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
tweak

Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2011-07-01 16:00:44 UTC (rev 10912)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2011-07-01 18:19:25 UTC (rev 10913)
@@ -1748,13 +1748,15 @@
 
                   // TODO - this involves a scan - we should find a quicker way of doing it
                   MessageReference removed = queue.removeReferenceWithID(messageID);
-
-                  referencesToAck.add(removed);
-
+                  
                   if (removed == null)
                   {
                      log.warn("Failed to remove reference for " + messageID);
                   }
+                  else
+                  {
+                     referencesToAck.add(removed);
+                  }
 
                   break;
                }
@@ -1888,6 +1890,7 @@
 
             if (removed != null)
             {
+               log.info("PUTZ  Adding referencesToACK: " + removed);
                referencesToAck.add(removed);
             }
 
@@ -1895,6 +1898,8 @@
 
          for (MessageReference ack : referencesToAck)
          {
+            log.info("PUTZ Ack = " + ack);
+            log.info("PUTZ ACK.getQueue() = " + ack.getQueue());
             ack.getQueue().reacknowledge(tx, ack);
          }