Author: markt
Date: Wed Nov 13 11:19:26 2013
New Revision: 1541472
URL: http://svn.apache.org/r1541472
Log:
Improve error reporting.
- Be more precise about the location of the file with the error
- Don't swallow exceptions
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1541472&r1=1541471&r2=1541472&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Wed
Nov 13 11:19:26 2013
@@ -187,13 +187,13 @@ class TagLibraryInfoImpl extends TagLibr
}
} else {
// Tag library is packaged in JAR file
+ String uriExternal = jar.getJarFileURL().toExternalForm();
try {
in = jar.getInputStream(tldName);
- parseTLD(jar.getJarFileURL().toExternalForm(), in, jar);
+ parseTLD(uriExternal + "!/" + tldName, in, jar);
} catch (Exception ex) {
- err.jspError(mark, "jsp.error.tld.unable_to_read",
- jar.getJarFileURL().toExternalForm(), tldName,
- ex.toString());
+ err.jspError(mark, ex, "jsp.error.tld.unable_to_read",
+ uriExternal, tldName, ex.toString());
}
}
} finally {
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java?rev=1541472&r1=1541471&r2=1541472&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java Wed Nov 13
11:19:26 2013
@@ -78,7 +78,7 @@ public class JarFileUrlJar implements Ja
if (entry == null) {
return null;
} else {
- return jarFile.getInputStream(entry);
+ return new NonClosingJarInputStream(jarFile.getInputStream(entry));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
