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

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

Author: timfox
Date: 2007-02-16 07:25:11 -0500 (Fri, 16 Feb 2007)
New Revision: 2341

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


Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-02-16 11:14:15 UTC (rev 2340)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-02-16 12:25:11 UTC (rev 2341)
@@ -280,10 +280,15 @@
             }
                                  
             if (trace) { log.trace(this + " auto acknowledging delivery " + delivery); }
-                        
-            ackDelivery(sd, delivery);
-
+              
+            //We clear the state before so if the ackfails then
+            //we don't get a knock on exception on the next ack since we haven't
+            //cleared the state:
+            //http://jira.jboss.org/jira/browse/JBMESSAGING-852
+            
             state.setAutoAckInfo(null);
+            
+            ackDelivery(sd, delivery);            
          }
          else
          {