You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2004/12/09 17:49:35 UTC

svn commit: r111405 - /incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java

Author: mmerz
Date: Thu Dec  9 08:49:32 2004
New Revision: 111405

URL: http://svn.apache.org/viewcvs?view=rev&rev=111405
Log:
Fixed parameter processing for DOC/LIT WSDLs when multiple parameters are
present.

Contributor: Jonathan Colwell


Modified:
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java?view=diff&rev=111405&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java&r1=111404&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java&r2=111405
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java	Thu Dec  9 08:49:32 2004
@@ -314,9 +314,11 @@
                                     for (Element e : elements) {
                                         if (e.getName()
                                             .equals(element.getLocalPart())) {
-                                            ClientParameterMetadata wpm =
-                                                new ClientParameterMetadataImpl();
+                                         
                                             if (e.isSetType()) {
+                                                ClientParameterMetadata wpm =
+                                                    new ClientParameterMetadataImpl();
+                                         
                                                 // NOTE jcolwell@bea.com 2004-Nov-09 -- 
                                                 // DOC/BARE case
                                                 wpm.setWpName(e.getName());
@@ -341,14 +343,16 @@
                                                     && ct.isSetSequence()) {
                                                     // DOC/LIT WSDL
                                                     Group g = ct.getSequence();
-                                                    if (g.sizeOfElementArray() == 1) {
-                                                        e = g.getElementArray(0);
-                                                        wpm.setWpName(e.getName());
+                                                    for (Element el : g.getElementArray()) {
+                                                        ClientParameterMetadata wpm =
+                                                            new ClientParameterMetadataImpl();
+                                         
+                                                        wpm.setWpName(el.getName());
                                                         // FIXME jcolwell@bea.com 2004-Nov-09 -- double check the namespace stuff
                                                         wpm.setWpTargetNamespace
                                                             (s.getTargetNamespace());
 
-                                                        QName type = e.getType();
+                                                        QName type = el.getType();
                                                         wpm.setXmlType(type);
                                                         wpm.setJavaType(getTypeMappingUtil().q2Class(type));
                                                         /*
@@ -357,10 +361,6 @@
                                                           + wpm.getJavaType());
                                                         */
                                                         paramList.add(wpm);
-                                                    }
-                                                    else {
-                                                        // FIXME jcolwell@bea.com 2004-Nov-09 -- take this exception out once the code works consistently.
-                                                        throw new Exception("how did I get here");
                                                     }
                                                 }
                                             }