From 994e4abe0a8de57c7771610dfda1001551e04dfa Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Tue, 1 May 2018 21:24:24 -0500
Subject: [PATCH] ARTEMIS-1841 fixing bug introduced by ARTEMIS-1770

The change on commit 10849eb8abc01b8ae66c9ddeb350625efbc66384 was a
semantic change that caused the method to start swallowing exceptions.
This restores the original semantics.
---
 .../activemq/artemis/core/client/impl/ClientSessionImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index ac21a75eb5a..0187e9115c3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1545,6 +1545,7 @@ public void end(final Xid xid, final int flags) throws XAException {
                if (logger.isDebugEnabled()) {
                   logger.debug(ex.getMessage(), ex);
                }
+               throw ex;
             } finally {
                endCall();
             }
@@ -1754,6 +1755,7 @@ public void rollback(final Xid xid) throws XAException {
             if (logger.isDebugEnabled()) {
                logger.debug(ex.getMessage(), ex);
             }
+            throw ex;
          } finally {
             if (wasStarted) {
                start();