Author: dkulp
Date: Thu Oct 20 16:35:21 2011
New Revision: 1186901
URL: http://svn.apache.org/viewvc?rev=1186901&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=1186901&r1=1186900&r2=1186901&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
(original)
+++
cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Thu Oct 20 16:35:21 2011
@@ -135,10 +135,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)) {
