activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-136 extending XA change to also cover RBOTHER
Date Tue, 23 Jun 2015 14:31:32 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master e690da96a -> 7a383e48b


ARTEMIS-136 extending XA change to also cover RBOTHER


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f401a67f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f401a67f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f401a67f

Branch: refs/heads/master
Commit: f401a67ffe72f3aab54a0614cd4113f19e2940d9
Parents: e690da9
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Tue Jun 23 10:08:23 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Jun 23 10:08:23 2015 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/client/impl/ClientSessionImpl.java | 6 +++---
 .../tests/integration/cluster/failover/FailoverTest.java     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f401a67f/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
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 7bea631..36df058 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
@@ -1242,7 +1242,7 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
             {
                ActiveMQClientLogger.LOGGER.debug("Error on rollback during end call!", ignored);
             }
-            throw new XAException(XAException.XA_RBOTHER);
+            throw new XAException(XAException.XAER_RMFAIL);
          }
 
          try
@@ -1393,7 +1393,7 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
 
       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
@@ -1437,7 +1437,7 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
 
             ActiveMQClientLogger.LOGGER.errorDuringPrepare(e);
 
-            throw new XAException(XAException.XA_RBOTHER);
+            throw new XAException(XAException.XAER_RMFAIL);
          }
 
          ActiveMQClientLogger.LOGGER.errorDuringPrepare(e);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f401a67f/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 745ee62..8115d82 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -1185,7 +1185,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (XAException e)
       {
-         Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode);
+         Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
       }
 
       ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
@@ -1268,7 +1268,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (XAException e)
       {
-         Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode);
+         Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
          // XXXX  session.rollback();
       }
 
@@ -1405,7 +1405,7 @@ public class FailoverTest extends FailoverTestBase
       }
       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)
       {
-         Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode);
+         Assert.assertEquals(XAException.XAER_RMFAIL, e.errorCode);
       }
    }
 


Mime
View raw message