diff --git a/VERSION.txt b/VERSION.txt index ff479e72bef..c6b16cac638 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.5.0-SNAPSHOT + 351516 Refactored sessions to better support nosql session managers + 351576 Do not use deprecated method File.toURL() + + 352046 Need try/catch around features set in XmlParser jetty-7.4.4.v20110707 July 7th 2011 + 308851 Converted all jetty-client module tests to JUnit 4 diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java index 899452f69ac..6dc6cbbe788 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java @@ -108,7 +108,14 @@ public class XmlParser _parser.getXMLReader().setFeature("http://xml.org/sax/features/validation", validating); _parser.getXMLReader().setFeature("http://xml.org/sax/features/namespaces", true); _parser.getXMLReader().setFeature("http://xml.org/sax/features/namespace-prefixes", false); - _parser.getXMLReader().setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", validating); + try + { + _parser.getXMLReader().setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", validating); + } + catch (Exception e) + { + Log.warn(Log.EXCEPTION, e); + } } catch (Exception e) {