Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2017-11-03 08:55:00 +11:00
commit 070546148e
2 changed files with 2 additions and 2 deletions

View File

@ -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();
}
}