[jboss-svn-commits] JBL Code SVN: r25861 - in labs/jbosstm/trunk: ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 27 13:30:21 EDT 2009
Author: mark.little at jboss.com
Date: 2009-03-27 13:30:21 -0400 (Fri, 27 Mar 2009)
New Revision: 25861
Added:
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java
Modified:
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java
Log:
https://jira.jboss.org/jira/browse/JBTM-517
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2009-03-27 14:18:49 UTC (rev 25860)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -1417,6 +1417,7 @@
case ActionStatus.COMMITTED:
case ActionStatus.COMMITTING: // in case of async commit
_theTransaction.commit(true); // assure thread disassociation
+ return;
}
switch (_theTransaction.commit(true))
@@ -1499,6 +1500,7 @@
{
case ActionStatus.ABORTED:
case ActionStatus.ABORTING: // in case of async rollback
+ statusIsValid = true;
break;
default:
throw new InactiveTransactionException(
Added: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/RollbackTest.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2004,
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: SimpleTest.java 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.hp.mwtests.ts.jta.timeout;
+
+import com.hp.mwtests.ts.jta.common.TestResource;
+
+import javax.transaction.Transaction;
+import javax.transaction.xa.XAResource;
+
+public class RollbackTest
+{
+ public RollbackTest ()
+ {
+ try
+ {
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ boolean passed = false;
+
+ transactionManager.setTransactionTimeout(3);
+
+ transactionManager.begin();
+
+ try
+ {
+ Thread.currentThread().sleep(4000);
+ }
+ catch (Exception ex)
+ {
+ }
+
+ try
+ {
+ transactionManager.rollback();
+
+ passed = true;
+ }
+ catch (IllegalStateException ex)
+ {
+ passed = false;
+ }
+ catch (Exception ex)
+ {
+ passed = false;
+ }
+
+ if (passed)
+ System.err.println("Passed.");
+ else
+ System.err.println("Failed.");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(System.err);
+ System.err.println("ERROR - "+e);
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new RollbackTest();
+ }
+
+}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java 2009-03-27 14:18:49 UTC (rev 25860)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/timeout/SimpleTest.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -61,7 +61,7 @@
{
transactionManager.commit();
}
- catch (IllegalStateException ex)
+ catch (final javax.transaction.RollbackException ex)
{
passed = true;
}
Added: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/RollbackTest.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2004,
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: SimpleTest.java 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.hp.mwtests.ts.jta.jts.timeout;
+
+import com.arjuna.ats.internal.jts.ORBManager;
+
+import com.hp.mwtests.ts.jta.jts.common.*;
+
+import com.arjuna.ats.jta.common.*;
+import com.arjuna.ats.jta.*;
+import com.arjuna.ats.jta.utils.*;
+
+import com.arjuna.ats.arjuna.common.*;
+
+import com.arjuna.orbportability.*;
+
+public class RollbackTest
+{
+ public RollbackTest ()
+ {
+ try
+ {
+ javax.transaction.TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+ boolean passed = false;
+
+ transactionManager.setTransactionTimeout(3);
+
+ transactionManager.begin();
+
+ try
+ {
+ Thread.currentThread().sleep(4000);
+ }
+ catch (Exception ex)
+ {
+ }
+
+ try
+ {
+ transactionManager.rollback();
+
+ passed = true;
+ }
+ catch (IllegalStateException ex)
+ {
+ passed = false;
+ }
+ catch (Exception ex)
+ {
+ passed = false;
+ }
+
+ if (passed)
+ System.err.println("Passed.");
+ else
+ System.err.println("Failed.");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(System.err);
+ System.err.println("ERROR - "+e);
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ ORB myORB = null;
+ RootOA myOA = null;
+
+ try
+ {
+ myORB = ORB.getInstance("test");
+ myOA = OA.getRootOA(myORB);
+
+ myORB.initORB(args, null);
+ myOA.initOA();
+
+ ORBManager.setORB(myORB);
+ ORBManager.setPOA(myOA);
+ }
+ catch (Exception e)
+ {
+ System.err.println("Initialisation failed: "+e);
+
+ System.exit(0);
+ }
+
+ new RollbackTest();
+ }
+
+}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java 2009-03-27 14:18:49 UTC (rev 25860)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/timeout/SimpleTest.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -68,7 +68,7 @@
{
transactionManager.commit();
}
- catch (IllegalStateException ex)
+ catch (final javax.transaction.RollbackException ex)
{
passed = true;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java 2009-03-27 14:18:49 UTC (rev 25860)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/extensions/AtomicTransaction.java 2009-03-27 17:30:21 UTC (rev 25861)
@@ -416,8 +416,6 @@
catch (TRANSACTION_ROLLEDBACK e)
{
_theStatus = Status.StatusRolledBack;
-
- throw e;
}
catch (SystemException e)
{
More information about the jboss-svn-commits
mailing list