[jboss-cvs] JBoss Messaging SVN: r3258 - trunk/src/main/org/jboss/jms/server/endpoint.

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

Author: timfox
Date: 2007-10-29 17:09:57 -0400 (Mon, 29 Oct 2007)
New Revision: 3258

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
Minor tweak for edge case


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-10-29 17:37:32 UTC (rev 3257)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-10-29 21:09:57 UTC (rev 3258)
@@ -1007,7 +1007,15 @@
    	
    	if (rec == null)
    	{
-   		throw new java.lang.IllegalStateException("Cannot find delivery with id " + deliveryID);
+   		//This is ok - may happen at failover
+         
+   	   // This can happen when the failover node is being changed
+         // E.g. failover node changes, replicates start getting sent to the new failover node,
+         // then the new node requests to collect the deliveries from this node, at which point we deliver
+         // all waiting deliveries. Then the responses to the original ones come back.
+         // So we can ignore them
+         
+         return;
    	}
    	   	
    	boolean delivered = false;   	
@@ -1042,7 +1050,7 @@
 	   			{
 	   				if (!delivered)
 	   				{
-   	   				// Resonpse has come back out of order - this can happen when the failover node is being changed
+   	   				// Response has come back out of order - this can happen when the failover node is being changed
 	   					// E.g. failover node changes, replicates start getting sent to the new failover node,
 	   					// then the new node requests to collect the deliveries from this node, at which point we deliver
 	   					// all waiting deliveries. Then the responses to the original ones come back.