Author: markt
Date: Wed Nov 15 15:58:45 2017
New Revision: 1815325
URL: http://svn.apache.org/viewvc?rev=1815325&view=rev
Log:
Avoid possible NPE if no manifest is present.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java?rev=1815325&r1=1815324&r2=1815325&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
Wed Nov 15 15:58:45 2017
@@ -156,11 +156,15 @@ public abstract class AbstractInputStrea
if (multiRelease == null) {
if (JreCompat.isJre9Available()) {
Manifest manifest = jarInputStream.getManifest();
- String mrValue =
manifest.getMainAttributes().getValue("Multi-Release");
- if (mrValue == null) {
+ if (manifest == null) {
multiRelease = Boolean.FALSE;
} else {
- multiRelease = Boolean.valueOf(mrValue);
+ String mrValue =
manifest.getMainAttributes().getValue("Multi-Release");
+ if (mrValue == null) {
+ multiRelease = Boolean.FALSE;
+ } else {
+ multiRelease = Boolean.valueOf(mrValue);
+ }
}
} else {
multiRelease = Boolean.FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
