axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r397474 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description: ClientUtils.java WSDL2AxisServiceBuilder.java
Date Thu, 27 Apr 2006 08:21:31 GMT
Author: deepal
Date: Thu Apr 27 01:21:24 2006
New Revision: 397474

URL: http://svn.apache.org/viewcvs?rev=397474&view=rev
Log:
http://issues.apache.org/jira/browse/AXIS2-623

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java?rev=397474&r1=397473&r2=397474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
Thu Apr 27 01:21:24 2006
@@ -32,6 +32,9 @@
             }
         } else {
             if (msgctx.getOptions().getTransportOut() != null) {
+                if (msgctx.getOptions().getTransportOut().getSender() == null) {
+                    throw new AxisFault("Incomplete transport sender: missing sender!");
+                }
                 return msgctx.getOptions().getTransportOut();
             }
             if (epr == null || (epr.getAddress() == null)) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java?rev=397474&r1=397473&r2=397474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Thu Apr 27 01:21:24 2006
@@ -212,10 +212,10 @@
             axisService.setTargetNamespace(wsdl4jDefinition
                     .getTargetNamespace());
             //adding ns in the original WSDL
-            axisService.setNameSpacesMap(wsdl4jDefinition.getNamespaces());
             processPoliciesInDefintion(wsdl4jDefinition);
             //scheam generation
             processImports(wsdl4jDefinition);
+            axisService.setNameSpacesMap(wsdl4jDefinition.getNamespaces());
             Types wsdl4jTypes = wsdl4jDefinition.getTypes();
             if (null != wsdl4jTypes) {
                 this.copyExtensibleElements(wsdl4jTypes
@@ -894,7 +894,8 @@
                         Definition importedDef = wsdlImport.getDefinition();
                         if (importedDef != null) {
                             processImports(importedDef);
-
+                             //copy ns
+                            wsdl4jDefinition.getNamespaces().putAll(importedDef.getNamespaces());
                             //copy types
                             Types t = importedDef.getTypes();
                             List typesList = t.getExtensibilityElements();



Mime
View raw message