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 mc...@apache.org on 2007/12/14 13:00:04 UTC

svn commit: r604177 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors: ApplicationMsgProcessor.java CloseSequenceProcessor.java TerminateSeqMsgProcessor.java

Author: mckierna
Date: Fri Dec 14 04:00:01 2007
New Revision: 604177

URL: http://svn.apache.org/viewvc?rev=604177&view=rev
Log:
ensure 1.1 close and terminate have replyTo

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=604177&r1=604176&r2=604177&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Fri Dec 14 04:00:01 2007
@@ -243,7 +243,7 @@
 				} else {
 					specVersion = rmsBean.getRMVersion();
 				}
-				if(specVersion == Sandesha2Constants.SPEC_VERSIONS.v1_1) {
+				if(specVersion.equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)) {
 					EndpointReference replyTo = msgContext.getReplyTo();
 					if(replyTo == null || replyTo.hasAnonymousAddress()) {
 						//we are sync

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?rev=604177&r1=604176&r2=604177&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java Fri Dec 14 04:00:01 2007
@@ -117,6 +117,10 @@
 		closeSeqResponseRMMsg.setFlow(MessageContext.OUT_FLOW);
 		closeSeqResponseRMMsg.setProperty(Sandesha2Constants.APPLICATION_PROCESSING_DONE, "true");
 		closeSequenceResponseMsg.setResponseWritten(true);
+		if(rmBean instanceof RMSBean && rmBean.getRMVersion().equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)){
+			//we expect a response
+			closeSequenceResponseMsg.setReplyTo(rmBean.getReplyToEndpointReference());
+		}
 		closeSeqResponseRMMsg.addSOAPEnvelope();
 		
 		//

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=604177&r1=604176&r2=604177&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Fri Dec 14 04:00:01 2007
@@ -393,6 +393,10 @@
 
 		// Update the RMSBean with the terminate added flag
 		getStorageManager().getRMSBeanMgr().update(rmsBean);
+		
+		if(rmsBean.getRMVersion().equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)){
+			rmMsgCtx.setReplyTo(rmsBean.getAcksToEndpointReference());
+		}
 
 		// Send the outgoing message
 		// Set a retransmitter lastSentTime so that terminate will be send with



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org