You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/03/11 08:40:56 UTC
svn commit: r1080480 - in /cxf/branches/2.2.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Author: ningjiang
Date: Fri Mar 11 07:40:56 2011
New Revision: 1080480
URL: http://svn.apache.org/viewvc?rev=1080480&view=rev
Log:
Merged revisions 1065486 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1065486 | ffang | 2011-01-31 13:54:14 +0800 (Mon, 31 Jan 2011) | 9 lines
Merged revisions 1065483 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1065483 | ffang | 2011-01-31 13:39:48 +0800 (δΈ€, 31 1 2011) | 1 line
[CXF-3296]wsdl2java tool should always use catalog to resovle the overwriten url firstly
........
................
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 07:40:56 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254,1069739,1070037
+/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1065486,1069254,1069739,1070037
/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=1080480&r1=1080479&r2=1080480&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Fri Mar 11 07:40:56 2011
@@ -90,10 +90,11 @@ public final class CustomizationParser {
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) {
@@ -132,6 +133,9 @@ public final class CustomizationParser {
}
public Element getTargetNode(String uri) {
+ if (uri == null) {
+ return null;
+ }
if (uri.equals(wsdlURL) && wsdlNode != null) {
return wsdlNode;
}