[jbossws-commits] JBossWS SVN: r14865 - thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization.
Author: jim.ma
Date: 2011-08-16 05:55:03 -0400 (Tue, 16 Aug 2011)
New Revision: 14865
Modified:
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Log:
Update CustomizationParser to fix the test failure
Modified:
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
===================================================================
---
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2011-08-16
08:59:06 UTC (rev 14864)
+++
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2011-08-16
09:55:03 UTC (rev 14865)
@@ -90,11 +90,13 @@
try {
wsdlURL =
URIParserUtil.getAbsoluteURI((String)env.get(ToolConstants.CFG_WSDLURL));
- wsdlNode = getTargetNode(this.wsdlURL);
-
- if (wsdlNode == null && env.get(ToolConstants.CFG_CATALOG) != null)
{
+ if (env.get(ToolConstants.CFG_CATALOG) != null) {
wsdlNode = resolveNodeByCatalog(wsdlURL);
}
+
+ if (wsdlNode == null) {
+ wsdlNode = getTargetNode(this.wsdlURL);
+ }
if (wsdlNode == null) {
throw new ToolException(new Message("MISSING_WSDL", LOG,
wsdlURL));
@@ -132,6 +134,9 @@
}
public Element getTargetNode(String uri) {
+ if (uri == null) {
+ return null;
+ }
if (uri.equals(wsdlURL) && wsdlNode != null) {
return wsdlNode;
}