Author: markt
Date: Wed Jul 10 13:30:02 2013
New Revision: 1501763
URL: http://svn.apache.org/r1501763
Log:
Whoops. Fix JSPs with TLDs for apps that don't have a JSP config descriptor
element in their web.xml.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1501763&r1=1501762&r2=1501763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Wed Jul
10 13:30:02 2013
@@ -245,6 +245,9 @@ public class TldLocationsCache {
private void tldScanWebXml() throws Exception {
JspConfigDescriptor jspConfig = ctxt.getJspConfigDescriptor();
+ if (jspConfig == null) {
+ return;
+ }
Collection<TaglibDescriptor> taglibs = jspConfig.getTaglibs();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
