diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-08 16:33:40 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-08 16:33:40 +0000 |
| commit | 361797b1b7354dc25edf7b55529c98e46b5f8a86 (patch) | |
| tree | ceca92a56a008ebf21f133bf62e70c940ea7fa73 /libjava | |
| parent | 3141122e13ebe34d7e48b9dbd84823b7f368d127 (diff) | |
| download | ppe42-gcc-361797b1b7354dc25edf7b55529c98e46b5f8a86.tar.gz ppe42-gcc-361797b1b7354dc25edf7b55529c98e46b5f8a86.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122700 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 e5af87991a5..315ac4d009b 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 7ac4cc749fc..6bc069d3201 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 616257deb34..1740fbbe53f 100644 --- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class +++ b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class |
