From scm-return-48215-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Mon Mar 12 20:39:29 2012 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0206C9BE2 for ; Mon, 12 Mar 2012 20:39:28 +0000 (UTC) Received: (qmail 85974 invoked by uid 500); 12 Mar 2012 20:39:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85909 invoked by uid 500); 12 Mar 2012 20:39:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 85900 invoked by uid 99); 12 Mar 2012 20:39:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 20:39:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 20:39:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C01E42388C6C; Mon, 12 Mar 2012 20:39:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1299836 - /geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Date: Mon, 12 Mar 2012 20:39:06 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120312203906.C01E42388C6C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Mar 12 20:39:06 2012 New Revision: 1299836 URL: http://svn.apache.org/viewvc?rev=1299836&view=rev Log: Apply fix for Tomcat bug 52744 and additional fix for jar urls Modified: geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Modified: geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1299836&r1=1299835&r2=1299836&view=diff ============================================================================== --- geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java (original) +++ geronimo/external/trunk/tomcat-parent-7.0.19/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Mon Mar 12 20:39:06 2012 @@ -471,7 +471,7 @@ public abstract class Compiler { if (checkClass && jsw != null) { jsw.setServletClassLastModifiedTime(targetLastModified); } - if (targetLastModified != jspRealLastModified.longValue()) { + if ( (jspRealLastModified.longValue() - targetLastModified) > 1000l ) { if (log.isDebugEnabled()) { log.debug("Compiler: outdated: " + targetFile + " " + targetLastModified); @@ -494,6 +494,17 @@ public abstract class Compiler { while (it.hasNext()) { Entry include = it.next(); try { + 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; + } + URL includeUrl = ctxt.getResource(include.getKey()); if (includeUrl == null) { return true;