Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 33169 invoked from network); 23 Feb 2011 17:15:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Feb 2011 17:15:31 -0000 Received: (qmail 27931 invoked by uid 500); 23 Feb 2011 17:15:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27795 invoked by uid 500); 23 Feb 2011 17:15:29 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 27788 invoked by uid 99); 23 Feb 2011 17:15:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Feb 2011 17:15:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Feb 2011 17:15:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2190723889E7; Wed, 23 Feb 2011 17:15:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1073832 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java Date: Wed, 23 Feb 2011 17:15:05 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110223171505.2190723889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Feb 23 17:15:04 2011 New Revision: 1073832 URL: http://svn.apache.org/viewvc?rev=1073832&view=rev Log: Catch all exceptions and use the default NS if cannot be mapped. Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=1073832&r1=1073831&r2=1073832&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java Wed Feb 23 17:15:04 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; } }