Author: remy.maucherat(a)jboss.com Date: 2007-10-21 08:36:05 -0400 (Sun, 21 Oct 2007) New Revision: 318 Modified: trunk/java/org/apache/catalina/servlets/LocalStrings.properties trunk/java/org/apache/catalina/servlets/WebdavServlet.java Log: - Replace entity with blank text. Modified: trunk/java/org/apache/catalina/servlets/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/servlets/LocalStrings.properties 2007-10-20 23:36:09 UTC (rev 317) +++ trunk/java/org/apache/catalina/servlets/LocalStrings.properties 2007-10-21 12:36:05 UTC (rev 318) @@ -10,7 +10,6 @@ invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher invokerServlet.noWrapper=Container has not called setWrapper() for this servlet webdavservlet.jaxpfailed=JAXP initialization failed -webdavservlet.noentities=Entities are not allowed directory.filename=Filename directory.lastModified=Last Modified directory.parent=Up To {0} Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java =================================================================== --- trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2007-10-20 23:36:09 UTC (rev 317) +++ trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2007-10-21 12:36:05 UTC (rev 318) @@ -20,6 +20,7 @@ import java.io.IOException; +import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.security.MessageDigest; @@ -250,7 +251,7 @@ (new EntityResolver() { public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - throw new IllegalStateException(sm.getString("webdavservlet.noentities")); + return new InputSource(new StringReader("")); } }); } catch(ParserConfigurationException e) {