Merge branch '1.1.x'

pull/1635/merge
Andy Wilkinson 10 years ago
commit 316e5f78f9

@ -375,8 +375,10 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
private JarFile createJarFileFromFileEntry(JarEntryData sourceEntry) private JarFile createJarFileFromFileEntry(JarEntryData sourceEntry)
throws IOException { throws IOException {
if (sourceEntry.getMethod() != ZipEntry.STORED) { if (sourceEntry.getMethod() != ZipEntry.STORED) {
throw new IllegalStateException("Unable to open nested compressed entry " throw new IllegalStateException("Unable to open nested entry '"
+ sourceEntry.getName()); + sourceEntry.getName() + "'. It has been compressed and nested "
+ "jar files must be stored without compression. Please check the "
+ "mechanism used to create your executable jar file");
} }
return new JarFile(this.rootFile, this.pathFromRoot + "!/" return new JarFile(this.rootFile, this.pathFromRoot + "!/"
+ sourceEntry.getName(), sourceEntry.getData()); + sourceEntry.getName(), sourceEntry.getData());

Loading…
Cancel
Save