svn commit: r808280 - /webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java

[ruwan]

Author: ruwan
Date: Thu Aug 27 04:57:24 2009
New Revision: 808280

URL: http://svn.apache.org/viewvc?rev=808280&view=rev
Log:
Committing the patch from Rajika for WSCOMMONS-497

Modified:
    
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java

Modified: 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=808280&r1=808279&r2=808280&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
 Thu Aug 27 04:57:24 2009
@@ -32,6 +32,7 @@
 import javax.transaction.UserTransaction;
 import javax.transaction.NotSupportedException;
 import javax.transaction.SystemException;
+import javax.transaction.Status;
 import java.util.*;
 
 /**
@@ -393,7 +394,10 @@
                     try {
                         if (transactionality == BaseConstants.TRANSACTION_JTA) 
{
                             ut = getUserTransaction();
-                            ut.begin();
+                           // We will only create a new tx if there is no tx 
alive 
+                           if (ut.getStatus() == Status.STATUS_NO_TRANSACTION) 
{
+                               ut.begin();
+                           }   
                         }
                     } catch (NotSupportedException e) {
                         handleException("Listener Task is already associated 
with a transaction", e);