Author: violetagg
Date: Thu May 16 08:07:24 2013
New Revision: 1483229
URL: http://svn.apache.org/r1483229
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54981
ServletContext.getJspConfigDescriptor() must return NULL when there is no jsp
configuration
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1483229&r1=1483228&r2=1483229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu May
16 08:07:24 2013
@@ -1418,7 +1418,14 @@ public class ApplicationContext
@Override
public JspConfigDescriptor getJspConfigDescriptor() {
- return context.getJspConfigDescriptor();
+ JspConfigDescriptor jspConfigDescriptor = context
+ .getJspConfigDescriptor();
+ if (jspConfigDescriptor.getJspPropertyGroups().isEmpty()
+ && jspConfigDescriptor.getTaglibs().isEmpty()) {
+ return null;
+ } else {
+ return jspConfigDescriptor;
+ }
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1483229&r1=1483228&r2=1483229&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Thu
May 16 08:07:24 2013
@@ -98,6 +98,25 @@ public class TestApplicationContext exte
}
+ @Test
+ public void testGetJspConfigDescriptor() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp");
+ // app dir is relative to server home
+ StandardContext standardContext = (StandardContext) tomcat.addWebapp(
+ null, "/test", appDir.getAbsolutePath());
+
+ ServletContext servletContext = standardContext.getServletContext();
+
+ Assert.assertNull(servletContext.getJspConfigDescriptor());
+
+ tomcat.start();
+
+ Assert.assertNotNull(servletContext.getJspConfigDescriptor());
+ }
+
+
private ServletContext getServletContext() {
Tomcat tomcat = getTomcatInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
