You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ga...@apache.org on 2007/04/18 15:52:43 UTC
svn commit: r530021 - in /webservices/sandesha/trunk/java:
src/org/apache/sandesha2/handlers/ test/src/org/apache/sandesha2/faulttests/
Author: gatfora
Date: Wed Apr 18 06:52:42 2007
New Revision: 530021
URL: http://svn.apache.org/viewvc?view=rev&rev=530021
Log:
Enable the CSR Fault test. Move the RM Fault processing to the SandeshaGlobalInHandler which fixes the action not found error for RM1.0 Fault messages
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?view=diff&rev=530021&r1=530020&r2=530021
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Wed Apr 18 06:52:42 2007
@@ -40,6 +40,7 @@
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
+import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.Range;
import org.apache.sandesha2.util.RangeString;
@@ -101,14 +102,28 @@
}
}
}
-
}
// Check if this is an application message and if it is a duplicate
RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(msgContext);
-
+
// Set the RMMMessageContext as a property on the message so we can retrieve it later
msgContext.setProperty(Sandesha2Constants.MessageContextProperties.RM_MESSAGE_CONTEXT, rmMsgCtx);
+
+
+ StorageManager storageManager =
+ SandeshaUtil.getSandeshaStorageManager(rmMsgCtx.getConfigurationContext(),
+ rmMsgCtx.getConfigurationContext().getAxisConfiguration());
+
+ Transaction transaction = storageManager.getTransaction();
+ try {
+ //processing any incoming faults.
+ //This is responsible for Sandesha2 specific
+ FaultManager.processMessagesForFaults(rmMsgCtx);
+ }
+ finally {
+ transaction.commit();
+ }
if (rmMsgCtx.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
processApplicationMessage(rmMsgCtx);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?view=diff&rev=530021&r1=530020&r2=530021
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Wed Apr 18 06:52:42 2007
@@ -37,7 +37,6 @@
import org.apache.sandesha2.msgprocessors.SequenceProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -107,10 +106,6 @@
rmMsgCtx = (RMMsgContext)msgCtx.getProperty(Sandesha2Constants.MessageContextProperties.RM_MESSAGE_CONTEXT);
else
rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
-
- //processing any incoming faults.
- //This is responsible for Sandesha2 specific
- FaultManager.processMessagesForFaults(rmMsgCtx);
// validating the message
MessageValidator.validateMessage(rmMsgCtx, storageManager);
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java?view=diff&rev=530021&r1=530020&r2=530021
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java Wed Apr 18 06:52:42 2007
@@ -60,7 +60,7 @@
* operation.
* @throws Exception
*/
- public void _testSOAP11CreateSequenceRefusedInboundFault () throws Exception {
+ public void testSOAP11CreateSequenceRefusedInboundFault () throws Exception {
runTest(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org