Author: chamikara
Date: Fri Jul 7 11:21:28 2006
New Revision: 419945
URL: http://svn.apache.org/viewvc?rev=419945&view=rev
Log:
The patch from Andrew plus some corrections to avaoid test failures.
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=419945&r1=419944&r2=419945&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Fri Jul 7 11:21:28 2006
@@ -91,7 +91,15 @@
.getMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
if (sequenceAck != null) {
AcknowledgementProcessor ackProcessor = new
AcknowledgementProcessor();
+
+ //setting message type temporarily as ack message. so
that the ack processor would not be confused
+ int messageType = rmMsgCtx.getMessageType();
+
rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.ACK);
+
ackProcessor.processInMessage(rmMsgCtx);
+
+ //resetting the correct message type.
+ rmMsgCtx.setMessageType(messageType);
}
//TODO process embedded ack requests
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=419945&r1=419944&r2=419945&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Fri Jul 7 11:21:28 2006
@@ -70,7 +70,6 @@
SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
.getSOAPVersion(createSeqResponseRMMsgCtx.getSOAPEnvelope()));
- MessageContext createSeqResponseMsg =
createSeqResponseRMMsgCtx.getMessageContext();
ConfigurationContext configCtx = createSeqResponseRMMsgCtx
.getMessageContext().getConfigurationContext();
@@ -82,7 +81,15 @@
.getMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
if (sequenceAck != null) {
AcknowledgementProcessor ackProcessor = new
AcknowledgementProcessor();
+
+ //setting message type temporarily as ack message. so
that the ack processor would not be confused
+ int messageType =
createSeqResponseRMMsgCtx.getMessageType();
+
createSeqResponseRMMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.ACK);
+
ackProcessor.processInMessage(createSeqResponseRMMsgCtx);
+
+ //resetting the correct message type.
+ createSeqResponseRMMsgCtx.setMessageType(messageType);
}
//Processing the create sequence response.
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=419945&r1=419944&r2=419945&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Fri Jul 7 11:21:28 2006
@@ -79,7 +79,15 @@
.getMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
if (sequenceAck != null) {
AcknowledgementProcessor ackProcessor = new
AcknowledgementProcessor();
+
+ //setting message type temporarily as ack message. so
that the ack processor would not be confused
+ int messageType = terminateSeqRMMsg.getMessageType();
+
terminateSeqRMMsg.setMessageType(Sandesha2Constants.MessageTypes.ACK);
+
ackProcessor.processInMessage(terminateSeqRMMsg);
+
+ //resetting the correct message type.
+ terminateSeqRMMsg.setMessageType(messageType);
}
//Processing the terminate message
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?rev=419945&r1=419944&r2=419945&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Fri Jul 7 11:21:28 2006
@@ -26,7 +26,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
@@ -45,7 +44,6 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.msgprocessors.AcknowledgementProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
@@ -192,13 +190,11 @@
log.debug("Enter: FaultManager::checkForUnknownSequence, " + sequenceID);
MessageContext messageContext =
rmMessageContext.getMessageContext();
- ConfigurationContext configCtx =
messageContext.getConfigurationContext();
CreateSeqBeanMgr createSeqMgr =
storageManager.getCreateSeqBeanMgr();
int type = rmMessageContext.getMessageType();
boolean validSequence = true;
- String reason = null;
if (type==Sandesha2Constants.MessageTypes.ACK ||
type==Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE ||
@@ -215,7 +211,6 @@
} else {
NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
- SOAPEnvelope envelope = messageContext.getEnvelope();
Collection coll = mgr.retrieveAll();
Iterator it = coll.iterator();
@@ -230,8 +225,8 @@
}
}
- if (contains)
- validSequence = true;
+ if (!contains)
+ validSequence = false;
}
String rmNamespaceValue =
rmMessageContext.getRMNamespaceValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
