From: gary Date: Thu, 8 Mar 2007 16:33:40 +0000 (+0000) Subject: 2007-03-08 Gary Benson X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=361797b1b7354dc25edf7b55529c98e46b5f8a86;p=thirdparty%2Fgcc.git 2007-03-08 Gary Benson 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 --- diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index e5af87991a52..315ac4d009b1 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,5 +1,12 @@ +2007-03-08 Gary Benson + + 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 + 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 7ac4cc749fc5..6bc069d3201f 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 index 616257deb345..1740fbbe53f0 100644 Binary files a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class and b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class differ