Author: markt
Date: Wed Nov 15 16:01:51 2017
New Revision: 1815329
URL: http://svn.apache.org/viewvc?rev=1815329&view=rev
Log:
Avoid possible NPE if no manifest is present.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java?rev=1815329&r1=1815328&r2=1815329&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/UrlJar.java Wed Nov
15 16:01:51 2017
@@ -47,9 +47,11 @@ public class UrlJar implements Jar {
boolean multiRelease = false;
if (JreCompat.isJre9Available()) {
Manifest manifest = jarInputStream.getManifest();
- String mrValue =
manifest.getMainAttributes().getValue("Multi-Release");
- if (mrValue != null) {
- multiRelease = Boolean.valueOf(mrValue).booleanValue();
+ if (manifest != null) {
+ String mrValue =
manifest.getMainAttributes().getValue("Multi-Release");
+ if (mrValue != null) {
+ multiRelease = Boolean.valueOf(mrValue).booleanValue();
+ }
}
}
if (multiRelease) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
