git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Benson 2007-03-08 16:33:40 +00:00 committed by Gary Benson
parent 56bedf420f
commit 8c67ec7a88
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/classpath/ChangeLog.gcj
View File

@ -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> 2007-03-07 Gary Benson <gbenson@redhat.com>
PR classpath/30906:
* resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList: * resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList:
New file. New file.

16
libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
View File

@ -363,22 +363,6 @@ public class DomLSParser
source = new InputSource(in); source = new InputSource(in);
source.setSystemId(systemId); 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) if (source == null)
{ {
URL url = null; URL url = null;

BIN
libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class
View File

Binary file not shown.