[jboss-cvs] JBoss Messaging SVN: r1810 - trunk/src/main/org/jboss/jms/client/container

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

Author: timfox
Date: 2006-12-18 08:19:04 -0500 (Mon, 18 Dec 2006)
New Revision: 1810

Modified:
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
Log:
Fixed failing MessageConsumerTest



Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2006-12-18 03:53:08 UTC (rev 1809)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2006-12-18 13:19:04 UTC (rev 1810)
@@ -129,9 +129,7 @@
          // We cancel any client ack or transactional, we do this explicitly so we can pass the updated
          // delivery count information from client to server. We could just do this on the server but
          // we would lose delivery count info.
-         
-         //CLIENT_ACKNOWLEDGE cannot be used with MDBs so is always safe to cancel on this session
-         
+                  
          List cancels = new ArrayList();
          
          for(Iterator i = state.getClientAckList().iterator(); i.hasNext(); )
@@ -141,6 +139,13 @@
             cancels.add(cancel);
          }
          
+         if (!cancels.isEmpty())
+         {
+            //CLIENT_ACKNOWLEDGE cannot be used with MDBs so is always safe to cancel on this session
+            
+            del.cancelDeliveries(cancels);            
+         }
+         
          state.getClientAckList().clear();
       }