[jboss-svn-commits] JBL Code SVN: r19405 - labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event.

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

Author: unibrew
Date: 2008-04-03 19:46:37 -0400 (Thu, 03 Apr 2008)
New Revision: 19405

Modified:
   labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java
   labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java
Log:
[JBFORUMS-274] Fixes for standalone Forums.

Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java	2008-04-03 23:45:05 UTC (rev 19404)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java	2008-04-03 23:46:37 UTC (rev 19405)
@@ -79,7 +79,10 @@
         try
         {
            UserTransaction tx = (UserTransaction) ctx.lookup(USER_TRANSACTION_JNDI);
-           tx.begin();                      
+           if (tx.getStatus()!=javax.transaction.Status.STATUS_ACTIVE)
+           {
+               tx.begin();
+           }
         }
         catch (Throwable t)
         {

Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java	2008-04-03 23:45:05 UTC (rev 19404)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java	2008-04-03 23:46:37 UTC (rev 19405)
@@ -121,6 +121,8 @@
             {
 	            try
 	            {
+	                if (tx.getStatus()==javax.transaction.Status.STATUS_ACTIVE)
+	                {
 		            if(rollback)
 		            {
 		                tx.rollback();
@@ -129,6 +131,7 @@
 		            {
 		                tx.commit();
 		            }
+	                }
 	            }
 	            catch(Exception e)
 	            {