SECTION: Tools changes
M jsf-tools/src/com/sun/faces/config/DigesterFactory.java
- Adapt for change between JDK 1.4 and JDK 1.5 where
org.xml.sax.helper.DefaultHandler.resolveEntity() started throwing
IOException in 1.5, where it didn't in 1.4. Rethrow the IOException as
a SAXException.
Index: src/com/sun/faces/config/DigesterFactory.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/DigesterFactory.java,v
retrieving revision 1.3
diff -u -r1.3 DigesterFactory.java
--- src/com/sun/faces/config/DigesterFactory.java 8 Nov 2004 19:23:13 -0000 1.3
+++ src/com/sun/faces/config/DigesterFactory.java 15 Mar 2005 20:29:21 -0000
@@ -286,7 +286,14 @@
// If no system ID, defer to superclass
if (systemId == null) {
- return super.resolveEntity(publicId, systemId);
+ InputSource result = null;
+ try {
+ result = super.resolveEntity(publicId, systemId);
+ }
+ catch (Exception e) {
+ throw new SAXException(e);
+ }
+ return result;
}
String grammarName =
@@ -302,7 +309,12 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Unknown entity, deferring to superclass.");
}
- source = super.resolveEntity(publicId, systemId);
+ try {
+ source = super.resolveEntity(publicId, systemId);
+ }
+ catch (Exception e) {
+ throw new SAXException(e);
+ }
} else {
--
| 9 Business days to PR Spec Freeze
| ed.burns_at_sun.com | {home: 407 294 2468, office: 408 884 9519 OR x31640}
| homepage: | http://purl.oclc.org/NET/edburns/
| aim: edburns0sunw | iim: ed.burns_at_sun.com