diff options
| author | Ivan Afonichev <ivan.afonichev@gmail.com> | 2012-01-12 01:55:49 +0400 |
|---|---|---|
| committer | Ivan Afonichev <ivan.afonichev@gmail.com> | 2012-01-12 01:55:49 +0400 |
| commit | 86b2d177cf00f6ebaf978f1ad0c43cb100f185be (patch) | |
| tree | 93f21c3978739f793d92c74081cca662643eea24 /add_entity_resolver_setter.patch | |
| parent | a4cdf56b82db3fd9a8405c21f6b73d2a31c5e49e (diff) | |
| parent | 2178fabdb4947a7714871c9c56726b849263604a (diff) | |
| download | tomcat-86b2d177cf00f6ebaf978f1ad0c43cb100f185be.tar.gz tomcat-86b2d177cf00f6ebaf978f1ad0c43cb100f185be.tar.xz tomcat-86b2d177cf00f6ebaf978f1ad0c43cb100f185be.zip | |
Fix Merge
Diffstat (limited to 'add_entity_resolver_setter.patch')
| -rw-r--r-- | add_entity_resolver_setter.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/add_entity_resolver_setter.patch b/add_entity_resolver_setter.patch new file mode 100644 index 0000000..8a3f8a7 --- /dev/null +++ b/add_entity_resolver_setter.patch @@ -0,0 +1,19 @@ +--- java/org/apache/jasper/xmlparser/ParserUtils.java.sav 2012-01-11 12:19:05.303081671 +0200 ++++ java/org/apache/jasper/xmlparser/ParserUtils.java 2012-01-11 12:25:32.327526734 +0200 +@@ -132,6 +132,16 @@ public class ParserUtils { + + return (parseXMLDocument(uri, new InputSource(is))); + } ++ ++ /** ++ * Set the EntityResolver. ++ * This is needed when the dtds and Jasper itself are in different classloaders (e.g. OSGi environment). ++ * ++ * @parem er EntityResolver to use. ++ */ ++ public static void setEntityResolver(EntityResolver er) { ++ entityResolver = er; ++ } + + + // ------------------------------------------------------ Protected Methods |