Author: jim.ma Date: 2011-10-27 02:17:57 -0400 (Thu, 27 Oct 2011) New Revision: 15169 Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Log: Port the CXF-3296 fix to resolve the build failure Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2011-10-26 16:54:40 UTC (rev 15168) +++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java 2011-10-27 06:17:57 UTC (rev 15169) @@ -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; }