Merge pull request #184 from GoranSiska/master

Fix calling session recover when client in client acknowledge mode

Author: lahma

src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs

@@ -506,6 +506,10 @@ protected virtual void RollbackIfNecessary(ISession session)
                 // Transacted session created by this container -> rollback
                 EmsUtils.RollbackIfNecessary(session);
             }
+            else if (IsClientAcknowledge(session))
+            {
+                session.Recover();
+            }
         }
         /// <summary>
         /// Perform a rollback, handling rollback excepitons properly.
@@ -526,7 +530,12 @@ protected virtual void RollbackOnExceptionIfNecessary(ISession session, Exceptio
                     }
                     EmsUtils.RollbackIfNecessary(session);
                 }
-            } catch (EMSException)
+                else if (IsClientAcknowledge(session))
+                {
+                    session.Recover();
+                }
+            }
+            catch (EMSException)
             {
                 logger.Error("Application exception overriden by rollback exception", ex);
                 throw;

src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs

@@ -504,6 +504,10 @@ protected virtual void RollbackIfNecessary(ISession session)
                 // Transacted session created by this container -> rollback
                 NmsUtils.RollbackIfNecessary(session);
             }
+            else if (IsClientAcknowledge(session))
+            {
+                session.Recover();
+            }
         }
         /// <summary>
         /// Perform a rollback, handling rollback excepitons properly.
@@ -524,7 +528,12 @@ protected virtual void RollbackOnExceptionIfNecessary(ISession session, Exceptio
                     }
                     NmsUtils.RollbackIfNecessary(session);
                 }
-            } catch (NMSException)
+                else if (IsClientAcknowledge(session))
+                {
+                    session.Recover();
+                }
+            }
+            catch (NMSException)
             {
                 logger.Error("Application exception overriden by rollback exception", ex);
                 throw;