[jboss-cvs] JBoss Messaging SVN: r1688 - in branches/Branch_1_0_1_SP/src/main/org/jboss: jms/server/endpoint messaging/core

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

Author: timfox
Date: 2006-12-02 10:51:53 -0500 (Sat, 02 Dec 2006)
New Revision: 1688

Modified:
   branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
   branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java
Log:

Added a couple of trace statements back in



Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-12-02 15:36:36 UTC (rev 1687)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-12-02 15:51:53 UTC (rev 1688)
@@ -768,8 +768,21 @@
 
          try
          {
-            if (trace) { log.trace(ServerConsumerEndpoint.this + " handing " + list.size() + " message(s) over to the remoting layer"); }
-
+            if (trace)
+            {
+               StringBuffer sb = new StringBuffer(ServerConsumerEndpoint.this + " handing [");
+               for(int i = 0; i < list.size(); i++)
+               {
+                  sb.append(((MessageProxy)list.get(i)).getMessage().getMessageID());
+                  if (i < list.size() - 1)
+                  {
+                     sb.append(",");
+                  }
+               }
+               sb.append("] over to the remoting layer");
+               log.trace(sb.toString());
+            }
+            
             ClientDelivery del = new ClientDelivery(list, id);
 
             // TODO How can we ensure that messages for the same consumer aren't delivered

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-02 15:36:36 UTC (rev 1687)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-12-02 15:51:53 UTC (rev 1688)
@@ -651,6 +651,8 @@
 
             if (ref != null)
             {
+            	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
@@ -744,7 +746,9 @@
                            }
                            else
                            {
-                              iter.remove();
+                              iter.remove();     
+                              if (trace) { log.trace(this + " removed current message from iterator"); }                           
+
                            }
 
                            // delivered
@@ -754,6 +758,7 @@
                               synchronized (deliveryLock)
                               {
                                  deliveries.add(del);
+                                 if (trace) { log.trace(this + " starting to track  " + del); }
                               }
                            }
                         }