[jboss-cvs] JBossAS SVN: r75921 - trunk/testsuite/src/main/org/jboss/test/jca/adapter.

[jboss-cvs-commits at lists.jboss.org]

Author: jhalliday
Date: 2008-07-16 08:11:49 -0400 (Wed, 16 Jul 2008)
New Revision: 75921

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
Log:
Changed usages of XAER_RMERR to XAER_PROTO.  JBAS-5714


Modified: trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java	2008-07-16 11:54:20 UTC (rev 75920)
+++ trunk/testsuite/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java	2008-07-16 12:11:49 UTC (rev 75921)
@@ -251,7 +251,7 @@
             if (state == null && flags != TMNOFLAGS)
             {
                 XAException xaex = new XAException("Invalid start state=" + state + " xid=" + gid + " flags=" + flagString + " for " + this);
-                xaex.errorCode = XAException.XAER_RMERR;
+                xaex.errorCode = XAException.XAER_PROTO;
                 throw xaex;
             }
             if (state != null && state != SUSPENDED && state != ENDED
@@ -260,14 +260,14 @@
                )
             {
                 XAException xaex = new XAException("Invalid start state=" + state + " xid=" + gid + " flags=" + flagString + " for " + this);
-                xaex.errorCode = XAException.XAER_RMERR;
+                xaex.errorCode = XAException.XAER_PROTO;
                 throw xaex;
             }
 
             if ((flags & TMJOIN) != 0 && mcf.failJoin)
             {
                 XAException xaex = new XAException("Join is not allowed " + state + " xid=" + gid + " flags=" + flagString + " for " + this);
-                xaex.errorCode = XAException.XAER_RMERR;
+                xaex.errorCode = XAException.XAER_PROTO;
                 throw xaex;
             }
             xids.put(gid, STARTED);
@@ -305,7 +305,7 @@
             if (state != STARTED && state != SUSPENDED && state != ENDED)
             {
                 XAException xaex = new XAException("Invalid end state=" + state + " xid=" + gid + " " + this);
-                xaex.errorCode = XAException.XAER_RMERR;
+                xaex.errorCode = XAException.XAER_PROTO;
                 throw xaex;
             }
             if ((flags & TMSUSPEND) == 0)
@@ -338,7 +338,7 @@
             if (state != SUSPENDED && state != ENDED)
             {
                XAException xaex = new XAException("Invalid one phase commit state=" + state + " xid=" + gid + " " + this);
-               xaex.errorCode = XAException.XAER_RMERR;
+               xaex.errorCode = XAException.XAER_PROTO;
                throw xaex;
             }
          }
@@ -347,7 +347,7 @@
             if (state != PREPARED)
             {
                XAException xaex = new XAException("Invalid two phase commit state=" + state + " xid=" + gid + " " + this);
-               xaex.errorCode = XAException.XAER_RMERR;
+               xaex.errorCode = XAException.XAER_PROTO;
                throw xaex;
             }
          }
@@ -367,7 +367,7 @@
          if (state != SUSPENDED && state != ENDED && state != PREPARED)
          {
             XAException xaex = new XAException("Invalid rollback state=" + state + " xid=" + gid + " " + this);
-            xaex.errorCode = XAException.XAER_RMERR;
+            xaex.errorCode = XAException.XAER_PROTO;
             throw xaex;
          }
          xids.remove(gid);
@@ -385,7 +385,7 @@
          String state = (String) xids.get(gid);
          if (state != SUSPENDED && state != ENDED) {
             XAException xaex = new XAException("Invalid prepare state=" + state + " xid=" + gid + " " + this);
-            xaex.errorCode = XAException.XAER_RMERR;
+            xaex.errorCode = XAException.XAER_PROTO;
             throw xaex;
          }
          if (failInPrepare)
@@ -615,7 +615,7 @@
    {
       if (destroyed.get()) {
           XAException xaex = new XAException("Already destroyed " + this);
-          xaex.errorCode = XAException.XAER_RMERR;
+          xaex.errorCode = XAException.XAER_PROTO;
           throw xaex;
       }
    }