You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2007/07/31 10:22:13 UTC
svn commit: r561261 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
context/OperationContext.java engine/AxisEngine.java
receivers/AbstractMessageReceiver.java
Author: amilas
Date: Tue Jul 31 01:22:12 2007
New Revision: 561261
URL: http://svn.apache.org/viewvc?view=rev&rev=561261
Log:
merge the branch code to trunk.
did some trivial changes on operation context and axis2 engine
change abstract message reciever to supprot robust case
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=561261&r1=561260&r2=561261
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Tue Jul 31 01:22:12 2007
@@ -993,7 +993,7 @@
if (axisOperation != null) {
QName qname = axisOperation.getName();
if (qname != null) {
- opName = qname.toString();
+ opName = qname.getLocalPart();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=561261&r1=561260&r2=561261
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Tue Jul 31 01:22:12 2007
@@ -369,9 +369,8 @@
ArrayList executionChain = operationContext.getAxisOperation().getPhasesOutFlow();
//rather than having two steps added both oparation and global chain together
ArrayList outPhases = new ArrayList();
- outPhases.addAll((ArrayList) executionChain.clone());
- outPhases.addAll((ArrayList) msgContext.getConfigurationContext()
- .getAxisConfiguration().getOutFlowPhases().clone());
+ outPhases.addAll(executionChain);
+ outPhases.addAll(msgContext.getConfigurationContext().getAxisConfiguration().getOutFlowPhases());
msgContext.setExecutionChain(outPhases);
msgContext.setFLOW(MessageContext.OUT_FLOW);
try {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?view=diff&rev=561261&r1=561260&r2=561261
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Tue Jul 31 01:22:12 2007
@@ -34,6 +34,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.InOnlyAxisOperation;
+import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.engine.AxisEngine;
@@ -95,7 +96,8 @@
invokeBusinessLogic(messageCtx);
} catch (AxisFault fault) {
// If we're in-only, eat this. Otherwise, toss it upwards!
- if (messageCtx.getAxisOperation() instanceof InOnlyAxisOperation) {
+ if ((messageCtx.getAxisOperation() instanceof InOnlyAxisOperation) &&
+ !WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageCtx.getAxisOperation().getMessageExchangePattern())) {
log.error(fault);
} else {
throw fault;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org