Author: remy.maucherat(a)jboss.com
Date: 2007-10-21 08:51:27 -0400 (Sun, 21 Oct 2007)
New Revision: 319
Modified:
branches/2.0.x/src/share/classes/org/apache/catalina/servlets/WebdavServlet.java
Log:
- Also add a dummy entity resolver (some XML parsers do not
respect the expand flag).
Modified:
branches/2.0.x/src/share/classes/org/apache/catalina/servlets/WebdavServlet.java
===================================================================
---
branches/2.0.x/src/share/classes/org/apache/catalina/servlets/WebdavServlet.java 2007-10-21
12:36:05 UTC (rev 318)
+++
branches/2.0.x/src/share/classes/org/apache/catalina/servlets/WebdavServlet.java 2007-10-21
12:51:27 UTC (rev 319)
@@ -20,6 +20,7 @@
import java.io.IOException;
+import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.security.MessageDigest;
@@ -56,6 +57,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -244,6 +246,13 @@
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setExpandEntityReferences(false);
documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ documentBuilder.setEntityResolver
+ (new EntityResolver() {
+ public InputSource resolveEntity(String publicId, String systemId)
+ throws SAXException, IOException {
+ return new InputSource(new StringReader(""));
+ }
+ });
} catch(ParserConfigurationException e) {
throw new ServletException
(sm.getString("webdavservlet.jaxpfailed"));
Show replies by date