You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/02/18 00:47:36 UTC

svn commit: r154210 - geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java

Author: djencks
Date: Thu Feb 17 15:47:35 2005
New Revision: 154210

URL: http://svn.apache.org/viewcvs?view=rev&rev=154210
Log:
complex type can be from a type or an element

Modified:
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java?view=diff&r1=154209&r2=154210
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java Thu Feb 17 15:47:35 2005
@@ -806,7 +806,7 @@
                 part = (Part) message.getOrderedParts(null).iterator().next();
             }
             QName faultTypeQName = part.getElementName() == null ? part.getTypeName() : part.getElementName();
-            boolean isComplex = part.getTypeName() != null && complexTypeMap.containsKey(part.getTypeName());
+            boolean isComplex = faultTypeQName != null && complexTypeMap.containsKey(faultTypeQName);
             FaultDesc faultDesc = new FaultDesc(faultQName, className, faultTypeQName, isComplex);
 
             //constructor parameters
@@ -814,7 +814,7 @@
                 if (!isComplex) {
                     throw new DeploymentException("ConstructorParameterOrder can only be set for complex types, not " + faultTypeQName);
                 }
-                ComplexType complexType = (ComplexType) complexTypeMap.get(part.getTypeName());
+                ComplexType complexType = (ComplexType) complexTypeMap.get(faultTypeQName);
                 Map elementMap = new HashMap();
                 ExplicitGroup explicitGroup = complexType.getSequence();
                 LocalElement[] elements = explicitGroup.getElementArray();