You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/01/02 20:14:05 UTC

svn commit: r491901 - /incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java

Author: rfeng
Date: Tue Jan  2 11:14:04 2007
New Revision: 491901

URL: http://svn.apache.org/viewvc?view=rev&rev=491901
Log:
Test if the wrapper element (instead of child elements) is nillable 

Modified:
    incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java

Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java?view=diff&rev=491901&r1=491900&r2=491901
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java Tue Jan  2 11:14:04 2007
@@ -299,6 +299,10 @@
             if (element == null) {
                 return null;
             }
+            if(element.isNillable()) {
+                // Wrapper element cannot be nillable
+                return null;
+            }
             XmlSchemaType type = element.getSchemaType();
             if (type == null) {
                 String qName = element.getQName().toString();
@@ -330,7 +334,7 @@
                     return null;
                 }
                 XmlSchemaElement childElement = (XmlSchemaElement) schemaObject;
-                if (childElement.getName() == null || childElement.getRefName() != null || childElement.isNillable()) {
+                if (childElement.getName() == null || childElement.getRefName() != null) {
                     return null;
                 }
                 // TODO: Do we support maxOccurs >1 ?



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