diff options
| author | Gary Benson <gbenson@redhat.com> | 2007-03-08 16:33:40 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2007-03-08 16:33:40 +0000 |
| commit | 8c67ec7a88047289f5318c2bb03338899b8a3bd5 (patch) | |
| tree | ceca92a56a008ebf21f133bf62e70c940ea7fa73 /libjava/classpath | |
| parent | 56bedf420fd15955cfa194ead87f2beaedac9509 (diff) | |
| download | gcc-8c67ec7a88047289f5318c2bb03338899b8a3bd5.zip gcc-8c67ec7a88047289f5318c2bb03338899b8a3bd5.tar.gz gcc-8c67ec7a88047289f5318c2bb03338899b8a3bd5.tar.bz2 | |
re PR xml/30983 (DocumentBuilder.parse throws exception)
2007-03-08 Gary Benson <gbenson@redhat.com>
PR classpath/30983:
* gnu/xml/dom/ls/DomLSParser.java (getInputSource):
Do not use the entity resolver to resolve the top-level document.
From-SVN: r122700
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 7 | ||||
| -rw-r--r-- | libjava/classpath/gnu/xml/dom/ls/DomLSParser.java | 16 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class | bin | 10963 -> 10699 bytes |
3 files changed, 7 insertions, 16 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index e5af879..315ac4d 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,5 +1,12 @@ +2007-03-08 Gary Benson <gbenson@redhat.com> + + PR classpath/30983: + * gnu/xml/dom/ls/DomLSParser.java (getInputSource): + Do not use the entity resolver to resolve the top-level document. + 2007-03-07 Gary Benson <gbenson@redhat.com> + PR classpath/30906: * resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList: New file. diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java index 7ac4cc7..6bc069d 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java @@ -363,22 +363,6 @@ public class DomLSParser source = new InputSource(in); source.setSystemId(systemId); } - if (source == null && entityResolver != null) - { - String publicId = input.getPublicId(); - try - { - source = entityResolver.resolveEntity(publicId, systemId); - } - catch (SAXException e) - { - throw new DomLSException(LSException.PARSE_ERR, e); - } - catch (IOException e) - { - throw new DomLSException(LSException.PARSE_ERR, e); - } - } if (source == null) { URL url = null; diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class Binary files differindex 616257d..1740fbb 100644 --- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class +++ b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class |