Author: markt
Date: Wed Jul 20 19:41:18 2011
New Revision: 1148915
URL: http://svn.apache.org/viewvc?rev=1148915&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51532
JSP files with dependencies in JARs were recompiled on every access leading to
poor performance.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1148915&r1=1148914&r2=1148915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Jul 20
19:41:18 2011
@@ -494,7 +494,13 @@ public abstract class Compiler {
while (it.hasNext()) {
Entry<String,Long> include = it.next();
try {
- URL includeUrl = ctxt.getResource(include.getKey());
+ String key = include.getKey();
+ URL includeUrl;
+ if (key.startsWith("jar:")) {
+ includeUrl = new URL(key);
+ } else {
+ includeUrl = ctxt.getResource(include.getKey());
+ }
if (includeUrl == null) {
return true;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1148915&r1=1148914&r2=1148915&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 20 19:41:18 2011
@@ -93,6 +93,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>51532</bug>: JSP files with dependencies in JARs were recompiled
on
+ every access leading to poor performance. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
