Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv29575
Modified Files:
EntityResolver.java
Log Message:
added some debug, and a forgotten case
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: EntityResolver.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/EntityResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- EntityResolver.java 3 Sep 2008 23:41:47 -0000 1.1
+++ EntityResolver.java 5 Jan 2009 16:33:07 -0000 1.2
@@ -29,7 +29,7 @@
*
* @author Gerard van Enk
* @author Michiel Meeuwissen
- * @version $Id: EntityResolver.java,v 1.1 2008/09/03 23:41:47 michiel Exp $
+ * @version $Id: EntityResolver.java,v 1.2 2009/01/05 16:33:07 michiel Exp $
*/
public class EntityResolver implements org.xml.sax.EntityResolver {
@@ -326,10 +326,11 @@
if (res != null) {
definitionStream = res.getStream();
}
+ log.debug("Get definition stream by registered system id: " +
systemId + " " + definitionStream);
}
if (definitionStream == null) { // not succeeded with publicid, go
trying with systemId
-
+ log.debug("No definition stream yet");
//does systemId contain a mmbase-dtd
if ((systemId == null) || (! systemId.startsWith(DOMAIN))) {
// it's a systemId we can't do anything with,
@@ -343,6 +344,9 @@
// perhaps this should not be done if it is about
resolving _entities_ rather then dtd.
log.debug("Not validating, no need to resolve DTD (?),
returning empty resource for " + systemId);
return new InputSource(new ByteArrayInputStream(new
byte[0]));
+ } else {
+ log.debug("Cannot resolve " + systemId + ", leaving to
parser.");
+ return null;
}
} else {
final String mmResource = systemId.substring(DOMAIN.length());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
