QPID-6051: Fix handling of exceptions thrown from post commit or deferred actions on transaction commit

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1621106 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 4 deletions

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index d1ec2e139e..f6ef4256d0 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -1109,10 +1109,16 @@ public class AMQChannel<T extends AMQProtocolSession<T>>
                 @Override
                 public void run()
                 {
-                    immediateAction.run();
-                    _txnCommits.incrementAndGet();
-                    _txnStarts.incrementAndGet();
-                    decrementOutstandingTxnsIfNecessary();
+                    try
+                    {
+                        immediateAction.run();
+                    }
+                    finally
+                    {
+                        _txnCommits.incrementAndGet();
+                        _txnStarts.incrementAndGet();
+                        decrementOutstandingTxnsIfNecessary();
+                    }
                 }
             });
         }