Author: violetagg
Date: Thu Mar 24 19:24:14 2016
New Revision: 1736489
URL: http://svn.apache.org/viewvc?rev=1736489&view=rev
Log:
Fixed possible NPE in
o.a.catalina.loader.WebappClassLoaderBase.getResourceAsStream
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1736489&r1=1736488&r2=1736489&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Thu
Mar 24 19:24:14 2016
@@ -1086,7 +1086,9 @@ public abstract class WebappClassLoaderB
try {
if (hasExternalRepositories && stream == null) {
URL url = super.findResource(name);
- stream = url.openStream();
+ if (url != null) {
+ stream = url.openStream();
+ }
}
} catch (IOException e) {
// Ignore
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1736489&r1=1736488&r2=1736489&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 24 19:24:14 2016
@@ -62,6 +62,11 @@
<code>o.a.tomcat.util.http.ServerCookie</code>. Patch is provided by
Kyohei Nakamura. (violetagg)
</fix>
+ <fix>
+ Fixed possible NPE in
+
<code>o.a.catalina.loader.WebappClassLoaderBase.getResourceAsStream</code>
+ (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
