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

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

Author: clebert.suconic at jboss.com
Date: 2007-02-20 14:45:36 -0500 (Tue, 20 Feb 2007)
New Revision: 2370

Modified:
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-862

Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-02-20 15:50:55 UTC (rev 2369)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-02-20 19:45:36 UTC (rev 2370)
@@ -279,13 +279,14 @@
                                  
             if (trace) { log.trace(this + " auto acknowledging delivery " + delivery); }
               
-            // We clear the state before so if the acknowledgment fails then we don't get a knock on
-            // exception on the next ack since we haven't cleared the state. See
-            // http://jira.jboss.org/jira/browse/JBMESSAGING-852
-            
-            state.setAutoAckInfo(null);
-            
-            ackDelivery(sd, delivery);            
+            try
+            {
+               ackDelivery(sd, delivery);
+            }
+            finally
+            {
+               state.setAutoAckInfo(null);
+            }
          }
          else
          {