You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2007/03/07 15:49:39 UTC
svn commit: r515591 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
engine/AddressingBasedDispatcher.java i18n/resource.properties
Author: pradine
Date: Wed Mar 7 06:49:38 2007
New Revision: 515591
URL: http://svn.apache.org/viewvc?view=rev&rev=515591
Log:
Reversing changes made in revisions 512869 and 512966
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/resource.properties
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?view=diff&rev=515591&r1=515590&r2=515591
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Wed Mar 7 06:49:38 2007
@@ -146,13 +146,10 @@
.getOperationContext(relatesTo);
if (operationContext != null) {
- if (operationContext.isComplete()) {
- if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(msgctx.getLogIDString() +
- " Operation context is marked as complete. Calling cleanup on it.");
- }
- operationContext.cleanup();
- return InvocationResponse.CONTINUE;
+ if(operationContext.isComplete()){
+ // If the dispatch happens because of the RelatesTo and the mep is complete
+ // we should throw a more descriptive fault.
+ throw new AxisFault(Messages.getMessage("duplicaterelatesto",relatesTo));
}
msgctx.setAxisOperation(operationContext.getAxisOperation());
msgctx.setOperationContext(operationContext);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/resource.properties?view=diff&rev=515591&r1=515590&r2=515591
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/resource.properties Wed Mar 7 06:49:38 2007
@@ -241,3 +241,4 @@
CannotConfigureAxis2=The system cannot configure Axis2.
wsaddressingrequirednotpresent=WS-Addressing is required, but it cannot be found.
nomessagereciever=Message Receiver not found for AxisOperation: {0}
+duplicaterelatesto=The message is a duplicate (has the same reply relationship value) of an already processed message. RelatesTo = {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org