You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2005/12/06 22:15:06 UTC
svn commit: r354562 -
/incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
Author: jkaputin
Date: Tue Dec 6 13:14:55 2005
New Revision: 354562
URL: http://svn.apache.org/viewcvs?rev=354562&view=rev
Log:
in parseInterfaceFault, added a null check on 'name' to
avoid possible NPE and improved the error reporting.
Modified:
incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
Modified: incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java?rev=354562&r1=354561&r2=354562&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java Tue Dec 6 13:14:55 2005
@@ -617,19 +617,15 @@
fault.setParentElement(parent);
((InterfaceFaultImpl)fault).setTypes(desc.getTypesElement());
- String name =
- DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
-
+ String name = DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
if(name != null)
{
- QName qname = new QName(desc.getTargetNamespace().toString(), name);
+ String ns = desc.getTargetNamespace() != null ?
+ desc.getTargetNamespace().toString() :
+ Constants.VALUE_EMPTY_STRING;
+ QName qname = new QName(ns, name);
fault.setName(qname);
}
- else
- {
- //If validation is on, let the validator handle this.
- //TODO terminate if validation=false and continue-on-error=false.
- }
String element = DOMUtils.getAttribute(faultEl, Constants.ATTR_ELEMENT);
if(element != null)
@@ -638,13 +634,11 @@
QName qname = DOMUtils.getQName(element, faultEl, desc);
fault.setElementName(qname);
} catch (WSDLException e) {
- //report the parse-time error and let the validator handle it.
getErrorReporter().reportError(
new ErrorLocatorImpl(), //TODO line&col nos.
"WSDL504",
- new Object[] {element, "fault"},
+ new Object[] {element, faultEl.getLocalName()},
ErrorReporter.SEVERITY_ERROR);
- //TODO if validation is off and continue-on-error is off, terminate here
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org