You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/02/23 18:18:44 UTC
svn commit: r1073836 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Author: dkulp
Date: Wed Feb 23 17:18:43 2011
New Revision: 1073836
URL: http://svn.apache.org/viewvc?rev=1073836&view=rev
Log:
Merged revisions 1073832 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1073832 | dkulp | 2011-02-23 12:15:04 -0500 (Wed, 23 Feb 2011) | 1 line
Catch all exceptions and use the default NS if cannot be mapped.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=1073836&r1=1073835&r2=1073836&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java Wed Feb 23 17:18:43 2011
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -88,9 +87,7 @@ public final class AttachmentUtil {
URI uri = new URI(ns);
String host = uri.toURL().getHost();
cid = host;
- } catch (URISyntaxException e) {
- cid = ns;
- } catch (MalformedURLException e) {
+ } catch (Exception e) {
cid = ns;
}
}