Issue #1797 MR Jar. Fixed NPE

2017-11-03 07:51:26 +11:00 · 2017-11-03 07:51:26 +11:00 · 6e7560acd1
parent 482a643781
commit 6e7560acd1
2 changed files with 2 additions and 2 deletions
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java
@ -87,9 +87,9 @@ public class MultiReleaseJarFile

            if (entry.inner)
            {
-                VersionedJarEntry outer = map.get(entry.outer);
+                VersionedJarEntry outer = entry.outer==null?null:map.get(entry.outer);

-                if (entry.outer==null || outer.version!= entry.version)
+                if (entry.outer==null || outer==null || outer.version!= entry.version)
                    i.remove();
            }
        }
--- a/jetty-util/src/test/resources/example.jar
+++ b/jetty-util/src/test/resources/example.jar