axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r479005 - in /webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2: description/OutInAxisOperation.java description/OutOnlyAxisOperation.java engine/AxisConfiguration.java engine/AxisEngine.java util/Utils.java
Date Fri, 24 Nov 2006 21:32:32 GMT
Author: dims
Date: Fri Nov 24 13:32:30 2006
New Revision: 479005

URL: http://svn.apache.org/viewvc?view=rev&rev=479005
Log:
yet another Fix for AXIS2-1769 for performance

Modified:
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/util/Utils.java

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=479005&r1=479004&r2=479005
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Fri Nov 24 13:32:30 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/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=479005&r1=479004&r2=479005
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
Fri Nov 24 13:32:30 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/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=479005&r1=479004&r2=479005
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Fri Nov 24 13:32:30 2006
@@ -863,6 +863,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/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=479005&r1=479004&r2=479005
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
Fri Nov 24 13:32:30 2006
@@ -39,6 +39,7 @@
 import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.TargetResolver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -206,7 +207,10 @@
         }
 
         // do Target Resolution
-        faultContext.getConfigurationContext().getAxisConfiguration().getTargetResolverChain().resolveTarget(faultContext);
+        TargetResolver targetResolver = faultContext.getConfigurationContext().getAxisConfiguration().getTargetResolverChain();
+        if(targetResolver != null){
+            targetResolver.resolveTarget(faultContext);
+        }
 
         //Determine that we have the correct transport available.
         TransportOutDescription transportOut = faultContext.getTransportOut();

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=479005&r1=479004&r2=479005
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/util/Utils.java
Fri Nov 24 13:32:30 2006
@@ -70,7 +70,10 @@
                 inMessageContext.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES));
 
         // do Target Resolution
-        newmsgCtx.getConfigurationContext().getAxisConfiguration().getTargetResolverChain().resolveTarget(newmsgCtx);
+        TargetResolver targetResolver = newmsgCtx.getConfigurationContext().getAxisConfiguration().getTargetResolverChain();
+        if(targetResolver != null){
+            targetResolver.resolveTarget(newmsgCtx);
+        }
 
         newmsgCtx.addRelatesTo(new RelatesTo(oldOptions.getMessageId()));
 



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


Mime
View raw message