Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50680

Prevent an NPE when using tag files from an exploded JAR file, e.g. from within an IDE.
Patch provided by Larry Isaacs.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1064890 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 6197517..9da3978 100644 (file)
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -626,10 +626,15 @@ class TagFileProcessor {
                         compiler.getCompilationContext().getTldLocation(
                             tagFileInfo.getTagInfo().getTagLibrary().getURI());
                     JarResource jarResource = location.getJarResource();
-                    // Add TLD
-                    pageInfo.addDependant(jarResource.getEntry(location.getName()).toString());
-                    // Add Tag
-                    pageInfo.addDependant(jarResource.getEntry(tagFilePath.substring(1)).toString());
+                    if (jarResource != null) {
+                        // Add TLD
+                        pageInfo.addDependant(jarResource.getEntry(location.getName()).toString());
+                        // Add Tag
+                        pageInfo.addDependant(jarResource.getEntry(tagFilePath.substring(1)).toString());
+                    }
+                    else {
+                        pageInfo.addDependant(tagFilePath);
+                    }
                 } else {
                     pageInfo.addDependant(tagFilePath);
                 }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4982279..957e347 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,11 @@
         Improve error message when EL identifiers are not valid Java identifiers
         and use i18n for the error message. (markt)
       </update>
+      <fix>
+        <bug>50680</bug>: Prevent an NPE when using tag files from an exploded
+        JAR file, e.g. from within an IDE. Patch provided by Larry Isaacs.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">