cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1186912 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Date Thu, 20 Oct 2011 16:46:33 GMT
Author: dkulp
Date: Thu Oct 20 16:46:33 2011
New Revision: 1186912

URL: http://svn.apache.org/viewvc?rev=1186912&view=rev
Log:
Merged revisions 1186901 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1186901 | dkulp | 2011-10-20 12:35:21 -0400 (Thu, 20 Oct 2011) | 10 lines
  
  Merged revisions 1186868 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1186868 | dkulp | 2011-10-20 11:53:08 -0400 (Thu, 20 Oct 2011) | 2 lines
    
    Fix issues if the systemId passed to ERU is an invalid URI.  A different
    exception is thrown in that case.
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java

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

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=1186912&r1=1186911&r2=1186912&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Thu Oct 20 16:46:33 2011
@@ -131,10 +131,12 @@ public final class EndpointReferenceUtil
                         url = new URL(url, systemId);
                         newId = url.toExternalForm();
                     }
+                } catch (IllegalArgumentException e) {
+                    //ignore - systemId not a valid URI
                 } catch (URISyntaxException e) {
-                    //ignore
+                    //ignore - baseURI not a valid URI
                 } catch (MalformedURLException e) {
-                    //ignore
+                    //ignore - baseURI or systemId not a URL either
                 }
             }
             if (done.contains(newId + ":" + namespaceURI)) {



Mime
View raw message