330229 - Jetty tries to parse META-INF/*.tld when jsp-api is not on classpath, causing DTD entity resoluton to fail

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2525 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jan Bartel 2010-11-17 01:43:11 +00:00
parent ba5343fe12
commit a9a56e8716
2 changed files with 13 additions and 1 deletions

View File

@ -2,6 +2,7 @@ jetty-7.2.2-SNAPSHOT
+ 330210 Improve performance of writing large bytes arrays + 330210 Improve performance of writing large bytes arrays
+ 330208 Support new wording on servlet-mapping and filter-mapping merging from servlet3.0a + 330208 Support new wording on servlet-mapping and filter-mapping merging from servlet3.0a
+ 330188 Reject web-fragment.xml with same <name> as another already loaded one + 330188 Reject web-fragment.xml with same <name> as another already loaded one
+ 330229 Jetty tries to parse META-INF/*.tld when jsp-api is not on classpath, causing DTD entity resoluton to fail
jetty-7.2.1.v20101111 11 November 2010 jetty-7.2.1.v20101111 11 November 2010
+ 324679 Fixed dedection of write before static content + 324679 Fixed dedection of write before static content

View File

@ -220,6 +220,16 @@ public class TagLibConfiguration extends AbstractConfiguration
@Override @Override
public void preConfigure(WebAppContext context) throws Exception public void preConfigure(WebAppContext context) throws Exception
{ {
try
{
Class jsp_page = Loader.loadClass(WebXmlConfiguration.class,"javax.servlet.jsp.JspPage");
}
catch (Exception e)
{
//no jsp available, don't parse TLDs
return;
}
Set tlds = new HashSet(); Set tlds = new HashSet();
// Find tld's from web.xml // Find tld's from web.xml
@ -297,7 +307,8 @@ public class TagLibConfiguration extends AbstractConfiguration
{ {
if (_processor == null) if (_processor == null)
{ {
Log.warn("No TldProcessor configured, skipping tld processing"); if (Log.isDebugEnabled())
Log.debug("No TldProcessor configured, skipping tld processing");
return; return;
} }