Author: violetagg
Date: Thu Mar 24 19:27:53 2016
New Revision: 1736490
URL: http://svn.apache.org/viewvc?rev=1736490&view=rev
Log:
Merged revision 1736489 from tomcat/trunk:
Fixed possible NPE in
o.a.catalina.loader.WebappClassLoaderBase.getResourceAsStream
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 24 19:27:53 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1736490&r1=1736489&r2=1736490&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Thu Mar 24 19:27:53 2016
@@ -1088,7 +1088,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/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1736490&r1=1736489&r2=1736490&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Mar 24 19:27:53 2016
@@ -57,6 +57,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="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
