svn commit: r953944 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: Constants.java receivers/AbstractMessageReceiver.java

[amilas]

Author: amilas
Date: Sat Jun 12 06:09:55 2010
New Revision: 953944

URL: http://svn.apache.org/viewvc?rev=953944&view=rev
Log:
applied the patch for AXIS2-4735

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=953944&r1=953943&r2=953944&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java 
(original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java 
Sat Jun 12 06:09:55 2010
@@ -306,6 +306,8 @@ public class Constants extends org.apach
     public static final String USER_TRANSACTION = "UserTransaction";
     public static final String TRANSACTION_MANAGER = "TransactionManager";
     public static final String SUSPENDED_TRANSACTION = "SuspendedTransaction";
+    /** A message level property indicating a request to rollback the 
transaction associated with the message */
+    public static final String SET_ROLLBACK_ONLY = "SET_ROLLBACK_ONLY";
 
    public static final String JSR311_ANNOTATIONS="JAXRSAnnotaion";
 

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=953944&r1=953943&r2=953944&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
 Sat Jun 12 06:09:55 2010
@@ -109,6 +109,8 @@ public abstract class AbstractMessageRec
         try {
             invokeBusinessLogic(messageCtx);
         } catch (AxisFault fault) {
+            // signal the transport to rollback the tx, if any
+            messageCtx.setProperty(Constants.SET_ROLLBACK_ONLY, true);
             // If we're in-only, eat this.  Otherwise, toss it upwards!
             if ((messageCtx.getAxisOperation() instanceof InOnlyAxisOperation) 
&&
                     
!WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageCtx.getAxisOperation().getMessageExchangePattern()))
 {