[jbossws-commits] JBossWS SVN: r1233 - in trunk/src/main/java/org/jboss/ws/metadata: . wsdl
Author: jason.greene(a)jboss.com
Date: 2006-10-16 23:12:40 -0400 (Mon, 16 Oct 2006)
New Revision: 1233
Modified:
trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
Log:
Fix document/literal bare assertion
Allow null elements in WSDLInterfaceOperation
Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-17 03:11:31
UTC (rev 1232)
+++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-17 03:12:40
UTC (rev 1233)
@@ -486,8 +486,8 @@
if (returnParam != null && !returnParam.isInHeader())
out++;
- if (!((oneWay && in == 1 && out == 0) || (in == 1 && out
== 1)))
- throw new WSException("The body of a documnet/literal bare message
requires only 1 input and only 1 output (or 0 if oneway). method: " + javaName +
" in: "
+ if (in > 1 || out > (oneWay ? 0 : 1))
+ throw new WSException("The body of a documnet/literal bare message
requires at most 1 input and at most 1 output (or 0 if oneway). method: " + javaName
+ " in: "
+ in + " out: " + out);
}
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-17
03:11:31 UTC (rev 1232)
+++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-17
03:12:40 UTC (rev 1233)
@@ -184,8 +184,6 @@
public void addOutput(WSDLInterfaceOperationOutput output)
{
QName xmlName = output.getElement();
- if (xmlName == null)
- throw new IllegalArgumentException("Illegal null element name");
if (outputs.get(xmlName) != null)
throw new WSException("Attempt to map multiple operation outputs to: "
+ xmlName);
outputs.put(xmlName, output);