JSP support to give more helpful error message on corrupted zip-s

freemarker · Aug 31, 2015 · a26e832 · a26e832
1 parent 3de562f
commit a26e832
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/main/java/freemarker/ext/jsp/TaglibFactory.java b/src/main/java/freemarker/ext/jsp/TaglibFactory.java
@@ -48,6 +48,7 @@
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
 import javax.servlet.ServletContext;
@@ -721,6 +722,16 @@ private void addTldLocationsFromJarDirectoryEntryURL(final URL jarBaseEntryUrl)
                 } finally {
                     zipIn.close();
                 }
+            } catch (ZipException e) {
+                // ZipException messages miss the zip URL 
+                IOException ioe = new IOException("Error reading ZIP (see cause excepetion) from: "
+                            + rawJarContentUrlEF);
+                try {
+                    ioe.initCause(e);
+                } catch (Exception e2) {
+                    throw e;
+                }
+                throw ioe;
             } finally {
                 in.close();
             }