svn commit: r799820 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java

[ruwan]

Author: ruwan
Date: Sat Aug  1 09:34:47 2009
New Revision: 799820

URL: http://svn.apache.org/viewvc?rev=799820&view=rev
Log:
Applying the patch with minor changes from Rajika for 
https://issues.apache.org/jira/browse/SYNAPSE-561

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java?rev=799820&r1=799819&r2=799820&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
 Sat Aug  1 09:34:47 2009
@@ -20,6 +20,7 @@
 package org.apache.synapse.mediators.transaction;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.transaction.TransactionConfiguration;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.SynapseLog;
@@ -159,17 +160,23 @@
     private TransactionManager getTransactionManager(MessageContext synCtx) {
 
         TransactionManager transactionManager = null;
-        try {
-            transactionManager = 
synCtx.getConfiguration().getAxisConfiguration()
-                    .getTransactionConfiguration().getTransactionManager();
+
+        try {    
+            TransactionConfiguration transactionConfiguration = 
synCtx.getConfiguration()
+                    .getAxisConfiguration().getTransactionConfiguration();
+
+            if (transactionConfiguration != null) {
+                transactionManager = 
transactionConfiguration.getTransactionManager();
+            } else {
+                handleException("TransactionConfiguration has not been found. 
" +
+                        "Please check the axis2.xml and uncomment/enable the " 
+
+                        "transaction configuration.", synCtx);
+            }
+            
         } catch (AxisFault ex) {
             handleException("Unable to get Transaction Manager", ex, synCtx);
         }
 
-        if (transactionManager == null) {
-            handleException("Unable to get Transaction Manager", synCtx);
-        }
-
         return transactionManager;
     }