Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 21BB710C61 for ; Fri, 17 Jan 2014 17:14:09 +0000 (UTC) Received: (qmail 96564 invoked by uid 500); 17 Jan 2014 17:14:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 96473 invoked by uid 500); 17 Jan 2014 17:14:04 -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 96216 invoked by uid 99); 17 Jan 2014 17:14:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 17:14:00 +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; Fri, 17 Jan 2014 17:13:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B8272388A36; Fri, 17 Jan 2014 17:13:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1559191 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Date: Fri, 17 Jan 2014 17:13:39 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140117171339.5B8272388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jan 17 17:13:38 2014 New Revision: 1559191 URL: http://svn.apache.org/r1559191 Log: Merged revisions 1559185 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1559185 | dkulp | 2014-01-17 12:03:54 -0500 (Fri, 17 Jan 2014) | 10 lines Merged revisions 1559172 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1559172 | dkulp | 2014-01-17 11:33:41 -0500 (Fri, 17 Jan 2014) | 2 lines [CXF-5498] Put a DOM level3 check around DOM level 3 API call ........ ........ Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=1559191&r1=1559190&r2=1559191&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Fri Jan 17 17:13:38 2014 @@ -87,7 +87,12 @@ public class W3CDOMStreamReader extends return document; } public String getSystemId() { - return sysId == null ? document.getDocumentURI() : sysId; + try { + return sysId == null ? document.getDocumentURI() : sysId; + } catch (Throwable ex) { + //ignore, probably not DOM level 3 + } + return sysId; } /** * Find name spaces declaration in atrributes and move them to separate @@ -431,8 +436,6 @@ public class W3CDOMStreamReader extends } try { return StaxUtils.toString(document); - } catch (XMLStreamException e) { - return super.toString(); } catch (Throwable t) { t.printStackTrace(); return super.toString();