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 2008/05/27 19:59:51 UTC
svn commit: r660627 - in /cxf/branches/2.0.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
Author: dkulp
Date: Tue May 27 10:59:48 2008
New Revision: 660627
URL: http://svn.apache.org/viewvc?rev=660627&view=rev
Log:
Merged revisions 659656 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r659656 | bimargulies | 2008-05-23 16:55:14 -0400 (Fri, 23 May 2008) | 2 lines
Try again to catch enough exceptions.
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=660627&r1=660626&r2=660627&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java (original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java Tue May 27 10:59:48 2008
@@ -67,7 +67,7 @@
Class<?> cls = Class.forName("com.ctc.wstx.sax.WstxSAXParserFactory");
saxParserFactory = (SAXParserFactory)cls.newInstance();
nsasaxParserFactory = (SAXParserFactory)cls.newInstance();
- } catch (Exception e) {
+ } catch (Throwable e) {
//woodstox not found, use any other Stax parser
saxParserFactory = SAXParserFactory.newInstance();
nsasaxParserFactory = SAXParserFactory.newInstance();
@@ -77,7 +77,7 @@
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces", true);
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
true);
- } catch (Exception e) {
+ } catch (Throwable e) {
//ignore
}
}
@@ -114,7 +114,7 @@
DocumentBuilderFactory factory = super.createDocumentBuilderFactory(validationMode, namespaceAware);
try {
factory.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
- } catch (Exception e) {
+ } catch (Throwable e) {
// we can get all kinds of exceptions from this
// due to old copies of Xerces and whatnot.
}