[jboss-cvs] JBossAS SVN: r98993 - in trunk: testsuite/src/main/org/jboss/test/cts/test and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2010-01-04 12:11:14 -0500 (Mon, 04 Jan 2010)
New Revision: 98993

Added:
   trunk/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java
Modified:
   trunk/server/src/main/java/org/jboss/tm/usertx/client/ClientUserTransaction.java
Log:
JBAS-7507

Modified: trunk/server/src/main/java/org/jboss/tm/usertx/client/ClientUserTransaction.java
===================================================================
--- trunk/server/src/main/java/org/jboss/tm/usertx/client/ClientUserTransaction.java	2010-01-04 17:08:24 UTC (rev 98992)
+++ trunk/server/src/main/java/org/jboss/tm/usertx/client/ClientUserTransaction.java	2010-01-04 17:11:14 UTC (rev 98993)
@@ -113,6 +113,9 @@
    public void begin()
       throws NotSupportedException, SystemException
    {
+      if(getStatus() != Status.STATUS_NO_TRANSACTION)
+         throw new NotSupportedException("Attempt to start a nested transaction (the transaction started previously hasn't been ended yet).");
+
       ThreadInfo info = getThreadInfo();
       trace = log.isTraceEnabled(); // Only check for trace enabled once per transaction
       

Added: trunk/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java	2010-01-04 17:11:14 UTC (rev 98993)
@@ -0,0 +1,76 @@
+/*
+ * 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 file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.cts.test;
+
+import java.util.Properties;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.NotSupportedException;
+import javax.transaction.UserTransaction;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.cts.interfaces.CtsCmpHome;
+import org.jboss.test.cts.interfaces.CtsCmp;
+import org.jboss.test.cts.keys.AccountPK;
+
+/** Tests of accessing the UserTransaction interface.
+ *
+ *  @author alex at jboss.org
+ *  @version $Revision: 57211 $
+ */
+public class NestedUserTransactionTestCase extends JBossTestCase
+{
+
+   public NestedUserTransactionTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testWithDefaultJndiContext() throws Exception
+   {
+      System.setProperty(Context.PROVIDER_URL, getServerHost() + ":1099");
+      InitialContext ctx = new InitialContext();
+      UserTransaction ut = (UserTransaction) ctx.lookup("UserTransaction");
+
+      ut.begin();
+      try
+      {
+         ut.begin();
+         fail("Attempt to start a nested user transaction should fail with NotSupportedException.");
+      }
+      catch(NotSupportedException e)
+      {
+         // expected
+      }
+      finally
+      {
+         ut.rollback();
+      }
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(NestedUserTransactionTestCase.class, "cts.jar");
+   }
+}