svn commit: r820602 - /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

[pa...@apache.org]

Author: parsonsd
Date: Thu Oct  1 10:50:28 2009
New Revision: 820602

URL: http://svn.apache.org/viewvc?rev=820602&view=rev
Log:
Fix for failing Sync2Way RSP interop tests

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=820602&r1=820601&r2=820602&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java Thu Oct  1 10:50:28 2009
@@ -645,24 +645,9 @@
 				int responseMessageType = responseRMMessage.getMessageType();
 				if(log.isDebugEnabled()) log.debug("inboundMsgType" + responseMessageType + "outgoing message type " + messageType);
 				 				
-				//if this is a response msg in response to a make connection then we have to take care with the service context
-				if((messageType == Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG || messageType == Sandesha2Constants.MessageTypes.UNKNOWN)
-						&& (responseMessageType == Sandesha2Constants.MessageTypes.APPLICATION 
-								|| responseMessageType == Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE
-								|| responseMessageType == Sandesha2Constants.MessageTypes.TERMINATE_SEQ_RESPONSE
-								|| responseMessageType == Sandesha2Constants.MessageTypes.CLOSE_SEQUENCE_RESPONSE)){
-				
-					//Setting the AxisService object
-					responseMessageContext.setAxisService(msgCtx.getAxisService());
+				//Setting the AxisService object
+				responseMessageContext.setAxisService(msgCtx.getAxisService());
 
-					//we cannot set service ctx for application response msgs or createSeqResponse msgs since the srvc ctx will not match the op ctx, causing
-					//problems with addressing
-					if(log.isDebugEnabled()) log.debug("NOT setting service ctx for response type " + messageType + ", current srvc ctx =" + responseMessageContext.getServiceContext());
-				}else {
-					if(log.isDebugEnabled()) log.debug("setting service ctx on msg as this is NOT a makeConnection>appResponse or makeConnection>createSeqResponse exchange pattern");
-					responseMessageContext.setServiceContext(msgCtx.getServiceContext());
-				}
-	
 				//If addressing is disabled we will be adding this message simply as the application response of the request message.
 				Boolean addressingDisabled = (Boolean) msgCtx.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
 				if (addressingDisabled!=null && Boolean.TRUE.equals(addressingDisabled)) {
@@ -673,7 +658,7 @@
 					if (requestMsgOpCtx.getAxisOperation().getMessageReceiver() == null) {
 						// Generate a new RM In Only operation
 
-						ServiceContext serviceCtx = responseMessageContext.getServiceContext();
+						ServiceContext serviceCtx = msgCtx.getServiceContext();
 						AxisOperation op = msgCtx.getAxisService().getOperation(Sandesha2Constants.RM_IN_ONLY_OPERATION);
 						responseMsgOpCtx = OperationContextFactory.createOperationContext (op.getAxisSpecificMEPConstant(), op, serviceCtx);					
 					}



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