Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
This commit is contained in:
commit
969c2d8e6a
|
@ -87,9 +87,9 @@ public class MultiReleaseJarFile
|
||||||
|
|
||||||
if (entry.inner)
|
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();
|
i.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue