From 9a5e9e59763989f2e1ceb8e7bc32376a203bc0d9 Mon Sep 17 00:00:00 2001
From: Alex Rudyy <orudyy@apache.org>
Date: Thu, 28 Aug 2014 09:43:27 +0000
Subject: 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@1621106 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/server/protocol/v0_8/AMQChannel.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'qpid/java/broker-plugins')

diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index d1ec2e139e..f6ef4256d0 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/qpid/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();
+                    }
                 }
             });
         }
-- 
cgit v1.2.1