[jboss-cvs] JBoss Messaging SVN: r1670 - branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core

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

Author: clebert.suconic at jboss.com
Date: 2006-11-30 19:57:42 -0500 (Thu, 30 Nov 2006)
New Revision: 1670

Modified:
   branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-660 - placing Ovidiu's traces back

Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-12-01 00:45:26 UTC (rev 1669)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-12-01 00:57:42 UTC (rev 1670)
@@ -672,8 +672,10 @@
 
             if (ref != null)
             {
-               // Check if message is expired (we also do this on the client side)
-               // If so ack it from the channel
+               if (trace) { log.trace(this + " pushing " + ref); }
+
+               // Check if message is expired (we also do this on the client side). If so ack it
+               // from the channel.
                if (ref.isExpired())
                {
                   if (trace) { log.trace("Message reference: " + ref + " has expired"); }
@@ -790,6 +792,7 @@
                            else
                            {
                               iter.remove();
+                              if (trace) { log.trace(this + " removed current message from iterator"); }
                            }
 
                            // delivered
@@ -799,6 +802,7 @@
                               synchronized (deliveryLock)
                               {
                                  deliveries.add(del);
+                                 if (trace) { log.trace(this + " starting to track  " + del); }
                               }
                            }
                         }
@@ -906,11 +910,7 @@
                // add to post commit callback
                ref.setOrdering(messageOrdering.increment());
                this.getCallback(tx).addRef(ref);
-               if (trace)
-               {
-                  log.trace(this + " added transactionally " + ref
-                           + " in memory");
-               }
+               if (trace) { log.trace(this + " added " + ref + " to memory transactional callback, in transaction: " + tx); }
             }
 
             if (ref.isReliable() && recoverable)
@@ -952,10 +952,7 @@
 
    protected void cancelInternal(Delivery del) throws Exception
    {
-      if (trace)
-      {
-         log.trace(this + " cancelling " + del + " in memory");
-      }
+      if (trace) { log.trace(this + " cancelling " + del + " in memory"); }
 
       boolean removed;
 
@@ -998,7 +995,7 @@
             pm.updateDeliveryCount(this.channelID, ref);
          }
 
-         if (trace) { log.trace(this + " added " + ref + " back into state"); }
+         if (trace) { log.trace(this + " added " + ref + " back into memory, ready for redelivery"); }
       }
    }
 
@@ -1022,6 +1019,7 @@
             paging = false;
          }
 
+         if (trace) { log.trace(this + " removing first message in memory, which is " + result); }
          return (MessageReference) result;
       }
    }
@@ -1114,11 +1112,7 @@
          {
             messageRefs.addLast(ref, ref.getPriority());
 
-            if (trace)
-            {
-               log.trace(this + " added " + ref
-                        + " non-transactionally in memory");
-            }
+            if (trace) { log.trace(this + " added " + ref + " in memory"); }
 
             if (messageRefs.size() == fullSize)
             {
@@ -1614,7 +1608,7 @@
          {
             MessageReference ref = (MessageReference) iter.next();
 
-            if (trace) { log.trace(this + ": adding " + ref + " to non-recoverable state"); }
+            if (trace) { log.trace(this + " adding " + ref + " to memory"); }
 
             try
             {