[jboss-cvs] JBoss Messaging SVN: r3242 - in trunk/src/main/org/jboss/jms: server/connectionmanager and 1 other directory.

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

Author: timfox
Date: 2007-10-25 14:12:00 -0400 (Thu, 25 Oct 2007)
New Revision: 3242

Modified:
   trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
   trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
Log:
Make sure returns true for ack


Modified: trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-10-25 12:49:33 UTC (rev 3241)
+++ trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-10-25 18:12:00 UTC (rev 3242)
@@ -453,12 +453,12 @@
                boolean ignore =
                   checkExpiredOrReachedMaxdeliveries(m, sessionDelegate, maxDeliveries, shouldAck);
                
+               log.info("*** IGNORE IS " + ignore);
+               
                if (!isConnectionConsumer && !ignore)
                {
                   DeliveryInfo info = new DeliveryInfo(m, consumerID, queueName, null, shouldAck);
                                                     
-                  m.incDeliveryCount();           
- 
                   sessionDelegate.preDeliver(info);                  
                   
                   //If post deliver didn't succeed and acknowledgement mode is auto_ack
@@ -466,7 +466,17 @@
                   //In order to maintain at most once semantics we must therefore not return
                   //the message
                   
-                  ignore = !sessionDelegate.postDeliver();                                       
+                  ignore = !sessionDelegate.postDeliver();  
+                  
+                  if (trace)
+                  {
+                  	log.trace("Post deliver returned " + !ignore);
+                  }
+                  
+                  if (!ignore)
+                  {
+                     m.incDeliveryCount();                                
+                  }
                }
                                              
                if (!ignore)
@@ -478,7 +488,7 @@
                
                if (trace)
                {
-                  log.trace(this + ": message expired or exceeded max deliveries, discarding");
+                  log.trace("Discarding message " + m);
                }
                
                // the message expired, so discard the message, adjust timeout and reenter the buffer

Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-10-25 12:49:33 UTC (rev 3241)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-10-25 18:12:00 UTC (rev 3242)
@@ -845,7 +845,7 @@
    	}
    	else
    	{
-   		return false;
+   		return true;
    	}
    }
    

Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-10-25 12:49:33 UTC (rev 3241)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-10-25 18:12:00 UTC (rev 3242)
@@ -89,33 +89,8 @@
 
    // ConnectionManager implementation -------------------------------------------------------------
 
-   private void dump()
-   {
-   	log.debug("***********Dumping conn map");
-   	for (Iterator iter = jmsClients.entrySet().iterator(); iter.hasNext(); )
-   	{
-   		Map.Entry entry = (Map.Entry)iter.next();
-   		
-   		String jmsClientVMID = (String)entry.getKey();
-   		
-   		Map endpoints = (Map)entry.getValue();
-   		
-   		log.debug(jmsClientVMID + "----->");
-   		
-   		for (Iterator iter2 = endpoints.entrySet().iterator(); iter2.hasNext(); )
-      	{
-   			Map.Entry entry2 = (Map.Entry)iter2.next();
-   			
-   			String sessionID = (String)entry2.getKey();
-   			
-   			ConnectionEndpoint endpoint = (ConnectionEndpoint)entry2.getValue();
-   			
-   			log.debug("            " + sessionID + "------>" + System.identityHashCode(endpoint));
-      	}
-   	}
-   	log.debug("*** Dumped conn map");
-   }
    
+   
    public synchronized void registerConnection(String jmsClientVMID,
                                                String remotingClientSessionID,
                                                ConnectionEndpoint endpoint)
@@ -137,8 +112,6 @@
       
       log.debug("registered connection " + endpoint + " as " +
                 Util.guidToString(remotingClientSessionID));
-      
-      dump();
    }
 
    public synchronized ConnectionEndpoint unregisterConnection(String jmsClientVMId,
@@ -261,7 +234,6 @@
          log.trace("SimpleConnectionManager was notified about node leaving from node " +
                     notification.nodeID);
          
-         dump();
          try
 			{
 				//We remove any consumers with the same JVMID as the node that just failed
@@ -491,5 +463,32 @@
       }
 
    }
+   
+   private void dump()
+   {
+   	log.debug("***********Dumping conn map");
+   	for (Iterator iter = jmsClients.entrySet().iterator(); iter.hasNext(); )
+   	{
+   		Map.Entry entry = (Map.Entry)iter.next();
+   		
+   		String jmsClientVMID = (String)entry.getKey();
+   		
+   		Map endpoints = (Map)entry.getValue();
+   		
+   		log.debug(jmsClientVMID + "----->");
+   		
+   		for (Iterator iter2 = endpoints.entrySet().iterator(); iter2.hasNext(); )
+      	{
+   			Map.Entry entry2 = (Map.Entry)iter2.next();
+   			
+   			String sessionID = (String)entry2.getKey();
+   			
+   			ConnectionEndpoint endpoint = (ConnectionEndpoint)entry2.getValue();
+   			
+   			log.debug("            " + sessionID + "------>" + System.identityHashCode(endpoint));
+      	}
+   	}
+   	log.debug("*** Dumped conn map");
+   }
 
 }