From 3b3101d8b5ae4f08a16c0b7111da6cad41bbd282 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 15 Nov 2005 23:20:01 +0000 Subject: Imported GNU Classpath 0.19 + gcj-import-20051115. * sources.am: Regenerated. * Makefile.in: Likewise. * scripts/makemake.tcl: Use glob -nocomplain. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/gnu/xml/aelfred2/SAXDriver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/classpath/gnu/xml/aelfred2/SAXDriver.java') diff --git a/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java b/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java index 7e950ce042a..6864ff65971 100644 --- a/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java +++ b/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java @@ -717,7 +717,9 @@ final public class SAXDriver } else { - in.setSystemId(absolutize(baseURI, in.getSystemId(), false)); + in.setSystemId(absolutize(baseURI, + in.getSystemId(), + entityResolver != base)); source = entityResolver.resolveEntity(in.getPublicId(), in.getSystemId()); if (source == null) -- cgit v1.2.3