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 ch...@apache.org on 2007/07/07 11:15:42 UTC

svn commit: r554167 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2: MessageValidator.java util/SandeshaUtil.java workers/SenderWorker.java

Author: chamikara
Date: Sat Jul  7 02:15:42 2007
New Revision: 554167

URL: http://svn.apache.org/viewvc?view=rev&rev=554167
Log:
bug fixes

Modified:
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
    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/MessageValidator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java?view=diff&rev=554167&r1=554166&r2=554167
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/MessageValidator.java Sat Jul  7 02:15:42 2007
@@ -111,7 +111,8 @@
 			if (replyTo==null || replyTo.hasAnonymousAddress())
 				anonReplyTo = true;
 			
-			if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(rmMsgContext.getRMSpecVersion()) &&
+			//For RM 1.0 there must be an offer to get an Anon response.
+			if (!Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(rmMsgContext.getRMSpecVersion()) &&
 				WSDL2Constants.MEP_URI_OUT_IN.equals(mep) &&
 				offer==null && anonReplyTo) {
 				

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=554167&r1=554166&r2=554167
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java Sat Jul  7 02:15:42 2007
@@ -425,6 +425,8 @@
 			
 			newMessageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION, 
 					referenceMessage.getProperty(AddressingConstants.WS_ADDRESSING_VERSION));
+			newMessageContext.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, 
+					referenceMessage.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES));
 			
 			copyConfiguredProperties (referenceMessage,newMessageContext);
 

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?view=diff&rev=554167&r1=554166&r2=554167
==============================================================================
--- 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 Sat Jul  7 02:15:42 2007
@@ -519,10 +519,11 @@
 				responseMessageContext.setConfigurationContext(msgCtx.getConfigurationContext());
 				responseMessageContext.setTransportIn(msgCtx.getTransportIn());
 				responseMessageContext.setTransportOut(msgCtx.getTransportOut());
-
 				responseMessageContext.setProperty(MessageContext.TRANSPORT_IN, msgCtx
 						.getProperty(MessageContext.TRANSPORT_IN));
-				responseMessageContext.setOperationContext(msgCtx.getOperationContext());
+				
+				//we will not be setting the operation context here since this msgs may not be an application reply.
+				//we let other dispatchers find it.
 				responseMessageContext.setServiceContext(msgCtx.getServiceContext());
 				responseMessageContext.setServiceGroupContext(msgCtx.getServiceGroupContext());
 
@@ -556,7 +557,7 @@
 				}
 				
 				//If addressing is disabled we will be adding this message simply as the application response of the request message.
-				Boolean addressingDisabled = (Boolean) msgCtx.getOptions().getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
+				Boolean addressingDisabled = (Boolean) msgCtx.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
 				if (addressingDisabled!=null && Boolean.TRUE.equals(addressingDisabled)) {
 					// If the AxisOperation object doesn't have a message receiver, it means that this was
 					// an out only op where we have added an ACK to the response.  Set the requestMsgOpCtx to



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