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 di...@apache.org on 2006/11/24 23:10:38 UTC
svn commit: r479023 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
description/OutInAxisOperation.java description/OutOnlyAxisOperation.java
engine/AxisConfiguration.java util/MessageContextBuilder.java
Author: dims
Date: Fri Nov 24 14:10:37 2006
New Revision: 479023
URL: http://svn.apache.org/viewvc?view=rev&rev=479023
Log:
Fix for AXIS2-1769
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=479023&r1=479022&r2=479023
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Fri Nov 24 14:10:37 2006
@@ -35,6 +35,7 @@
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.util.CallbackReceiver;
import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.TargetResolver;
import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
@@ -235,7 +236,10 @@
mc.setOptions(options);
// do Target Resolution
- cc.getAxisConfiguration().getTargetResolverChain().resolveTarget(mc);
+ TargetResolver targetResolver = cc.getAxisConfiguration().getTargetResolverChain();
+ if(targetResolver != null){
+ targetResolver.resolveTarget(mc);
+ }
// if the transport to use for sending is not specified, try to find it
// from the URL
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=479023&r1=479022&r2=479023
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java Fri Nov 24 14:10:37 2006
@@ -28,6 +28,7 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.TargetResolver;
import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
@@ -327,7 +328,10 @@
mc.setAxisMessage(axisOp.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
// do Target Resolution
- cc.getAxisConfiguration().getTargetResolverChain().resolveTarget(mc);
+ TargetResolver targetResolver = cc.getAxisConfiguration().getTargetResolverChain();
+ if(targetResolver != null){
+ targetResolver.resolveTarget(mc);
+ }
// setting message ID if it null
// if the transport to use for sending is not specified, try to find it
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=479023&r1=479022&r2=479023
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Fri Nov 24 14:10:37 2006
@@ -869,6 +869,9 @@
* resolveTarget is called
*/
public TargetResolver getTargetResolverChain() {
+ if(targetResolvers.isEmpty()){
+ return null;
+ }
return new TargetResolver() {
public void resolveTarget(MessageContext messageContext) {
Iterator iter = targetResolvers.iterator();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=479023&r1=479022&r2=479023
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Fri Nov 24 14:10:37 2006
@@ -106,7 +106,10 @@
newmsgCtx.setTo(inMessageContext.getReplyTo());
// do Target Resolution
- newmsgCtx.getConfigurationContext().getAxisConfiguration().getTargetResolverChain().resolveTarget(newmsgCtx);
+ TargetResolver targetResolver = newmsgCtx.getConfigurationContext().getAxisConfiguration().getTargetResolverChain();
+ if(targetResolver != null) {
+ targetResolver.resolveTarget(newmsgCtx);
+ }
// Determine ReplyTo for respome message. Normally 'None URI' but has a value if SOAP Session support is in use
AxisService axisService = inMessageContext.getAxisService();
@@ -198,7 +201,10 @@
}
// do Target Resolution
- faultContext.getConfigurationContext().getAxisConfiguration().getTargetResolverChain().resolveTarget(faultContext);
+ TargetResolver targetResolver = faultContext.getConfigurationContext().getAxisConfiguration().getTargetResolverChain();
+ if(targetResolver != null) {
+ targetResolver.resolveTarget(faultContext);
+ }
// Ensure transport settings match the scheme for the To EPR
setupCorrectTransportOut(faultContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org