clebertsuconic commented on code in PR #4828: URL: https://github.com/apache/activemq-artemis/pull/4828#discussion_r1524062480
########## artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java: ########## @@ -1901,18 +1901,10 @@ public void rollback(final Xid xid) throws XAException { workDone = false; } catch (XAException xae) { throw xae; - } catch (ActiveMQException e) { - if (e.getType() == ActiveMQExceptionType.UNBLOCKED || e.getType() == ActiveMQExceptionType.CONNECTION_TIMEDOUT || e.getType() == ActiveMQExceptionType.SHUTDOWN_ERROR) { - // Unblocked on failover - throw new XAException(XAException.XA_RETRY); - } - - // This should never occur - XAException xaException = new XAException(XAException.XAER_RMFAIL); - xaException.initCause(e); - throw xaException; } catch (Throwable t) { - // This could occur if the TM interrupts the thread + if (logger.isTraceEnabled()) { + logger.trace("Rollback failed:: {}", convert(xid), t); + } XAException xaException = new XAException(XAException.XAER_RMFAIL); Review Comment: @jbertram @ehsavoie I merged this, but this was of course intentional as there was a test validating it. I sent a further commit to fix the test. So, if you decide against this @ehsavoie please send a revert. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org