Author: dkulp
Date: Tue May 27 10:29:26 2008
New Revision: 660623
URL: http://svn.apache.org/viewvc?rev=660623&view=rev
Log:
Merged revisions 659648 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r659648 | bimargulies | 2008-05-23 16:26:01 -0400 (Fri, 23 May 2008) | 2 lines
Try harder to avoid blowing up for old XML parsers.
........
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=660623&r1=660622&r2=660623&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:29:26 2008
@@ -114,9 +114,11 @@
DocumentBuilderFactory factory =
super.createDocumentBuilderFactory(validationMode, namespaceAware);
try {
factory.setFeature("http://apache.org/xml/features/dom/defer-node-expansion";,
false);
- } catch (ParserConfigurationException pce) {
- // blank
+ } catch (Exception e) {
+ // we can get all kinds of exceptions from this
+ // due to old copies of Xerces and whatnot.
}
+
return factory;
}
