Author: remm
Date: Wed May 18 16:29:21 2016
New Revision: 1744432
URL: http://svn.apache.org/viewvc?rev=1744432&view=rev
Log:
59567: Fix a rare NPE case scanning TLDs [if no files are found, then the
return value of getResourcePaths is null, that is correct].
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1744432&r1=1744431&r2=1744432&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Wed May 18
16:29:21 2016
@@ -391,6 +391,9 @@ public class TldScanner {
// IDEs.
Set<String> paths = context.getResourcePaths(WEB_INF +
"classes/META-INF");
+ if (paths == null) {
+ return;
+ }
for (String path : paths) {
if (path.endsWith(TLD_EXT)) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1744432&r1=1744431&r2=1744432&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 18 16:29:21 2016
@@ -74,6 +74,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>59567</bug>: Fix NPE scanning webapps for TLDs when an exploded
+ JAR has an empty WEB-INF/classes/META-INF folder. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
