svn commit: r1065486 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

[ffang]

Author: ffang
Date: Mon Jan 31 05:54:14 2011
New Revision: 1065486

URL: http://svn.apache.org/viewvc?rev=1065486&view=rev
Log:
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.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.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.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=1065486&r1=1065485&r2=1065486&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 Mon Jan 31 05:54:14 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;
         }