[jboss-cvs] JBoss Messaging SVN: r2877 - in trunk/src/main/org/jboss: messaging/core/impl and 1 other directory.

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

Author: timfox
Date: 2007-07-11 15:04:55 -0400 (Wed, 11 Jul 2007)
New Revision: 2877

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
Log:
Fixed MergeQueueTest


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-07-11 18:00:52 UTC (rev 2876)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-07-11 19:04:55 UTC (rev 2877)
@@ -939,7 +939,7 @@
    {
    	//	First deliver any waiting deliveries
    	
-   	if (trace) { log.trace("Delivering any waiting deliveries"); }
+   	if (trace) { log.trace("Delivering any waiting deliveries: " + queueName); }
    	
    	List toAddBack = null;
    	
@@ -952,7 +952,9 @@
    			break;
    		}
    		
-   		if (dr.queueName == null || dr.queueName.equals(queueName))
+   		if (trace) { log.trace("Considering " + dr); } 
+   		
+   		if (queueName == null || dr.queueName.equals(queueName))
    		{   		
 	   		performDelivery(dr.del.getReference(), dr.deliveryID, dr.getConsumer()); 
 				
@@ -2071,7 +2073,7 @@
     */
    private static class DeliveryRecord
    {
-   	// We need to cache the attributes here  since the consumer may get gc'd BEFORE the delivery is acked
+   	// We need to cache the attributes here  since the consumer may get gc'd BEFORE the delivery is acked   	
    	
       Delivery del;
         
@@ -2139,6 +2141,11 @@
          //the consumer being gc'd
          this.consumerRef = new WeakReference(consumer);
       }            
+      
+   	public String toString()
+   	{
+   		return "DeliveryRecord " + System.identityHashCode(this) + " del: " + del + " queueName: " + queueName;
+   	}
    }
    
    /**

Modified: trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-07-11 18:00:52 UTC (rev 2876)
+++ trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-07-11 19:04:55 UTC (rev 2877)
@@ -207,7 +207,8 @@
     */
    public void mergeIn(long theChannelID, int nodeID) throws Exception
    {
-      if (trace) { log.trace("Merging queue " + channelID + " node id " + nodeID + " into " + this); }
+      if (trace) { log.trace("Merging queue " + channelID + " node id " + nodeID + " into " + this + 
+      		                 " initially refs:" + messageRefs.size()); }
            
       synchronized (lock)
       {