[teiid-commits] teiid SVN: r951 - trunk/engine/src/main/java/org/teiid/dqp/internal/transaction.

[teiid-commits at lists.jboss.org]

Author: li.liang
Date: 2009-05-15 13:25:24 -0400 (Fri, 15 May 2009)
New Revision: 951

Modified:
   trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java
Log:
TEIID-604 Changed not to throw exception when end is called with flag TMFAIL.

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java	2009-05-15 17:04:01 UTC (rev 950)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/transaction/TransactionServerImpl.java	2009-05-15 17:25:24 UTC (rev 951)
@@ -312,7 +312,7 @@
                     } catch (SystemException err) {
                         throw new XATransactionException(err, XAException.XAER_RMERR);
                     }
-                    throw new XATransactionException(new XAException(XAException.XA_RBROLLBACK));
+                    break;
                 }
                 default:
                     throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$
@@ -329,7 +329,7 @@
         TransactionContextImpl tc = transactions.getTransactionContext(xid);
         
         if (transactionExpected && tc == null) {
-            throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$
+            throw new XATransactionException(XAException.XAER_NOTA, DQPPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$
         } else if (!transactionExpected) {
             if (tc != null) {
                 throw new XATransactionException(XAException.XAER_DUPID, DQPPlugin.Util.getString("TransactionServer.existing_global_transaction", new Object[] {xid})); //$NON-NLS-1$