Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-136 extending XA change to also cover RBOTHER

This commit is contained in:
Clebert Suconic 2015-06-23 10:08:23 -04:00
parent e690da96a6
commit f401a67ffe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
View File

@ -1242,7 +1242,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
{ {
ActiveMQClientLogger.LOGGER.debug("Error on rollback during end call!", ignored); ActiveMQClientLogger.LOGGER.debug("Error on rollback during end call!", ignored);
} }
throw new XAException(XAException.XA_RBOTHER); throw new XAException(XAException.XAER_RMFAIL);
} }
try try
@ -1393,7 +1393,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
if (rollbackOnly) if (rollbackOnly)
{ {
throw new XAException(XAException.XA_RBOTHER); throw new XAException(XAException.XAER_RMFAIL);
} }
// Note - don't need to flush acks since the previous end would have // Note - don't need to flush acks since the previous end would have
@ -1437,7 +1437,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
ActiveMQClientLogger.LOGGER.errorDuringPrepare(e); ActiveMQClientLogger.LOGGER.errorDuringPrepare(e);
throw new XAException(XAException.XA_RBOTHER); throw new XAException(XAException.XAER_RMFAIL);
} }
ActiveMQClientLogger.LOGGER.errorDuringPrepare(e); ActiveMQClientLogger.LOGGER.errorDuringPrepare(e);

8
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
View File

@ -1185,7 +1185,7 @@ public class FailoverTest extends FailoverTestBase
} }
catch (XAException e) catch (XAException e)
{ {
Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode); Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
} }
ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
@ -1268,7 +1268,7 @@ public class FailoverTest extends FailoverTestBase
} }
catch (XAException e) catch (XAException e)
{ {
Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode); Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
// XXXX session.rollback(); // XXXX session.rollback();
} }
@ -1405,7 +1405,7 @@ public class FailoverTest extends FailoverTestBase
} }
catch (XAException e) catch (XAException e)
{ {
Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode); Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
} }
} }
@ -1491,7 +1491,7 @@ public class FailoverTest extends FailoverTestBase
} }
catch (XAException e) catch (XAException e)
{ {
Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode); Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
} }
} }