From scm-return-48854-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Aug 9 03:09:15 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 71800DF48 for ; Thu, 9 Aug 2012 03:09:15 +0000 (UTC) Received: (qmail 36727 invoked by uid 500); 9 Aug 2012 03:09:15 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 36345 invoked by uid 500); 9 Aug 2012 03:09:10 -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 36310 invoked by uid 99); 9 Aug 2012 03:09:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 03:09:09 +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; Thu, 09 Aug 2012 03:09:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CDF98238889B; Thu, 9 Aug 2012 03:08:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1371029 - /geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Date: Thu, 09 Aug 2012 03:08:24 -0000 To: scm@geronimo.apache.org From: violalu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120809030824.CDF98238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: violalu Date: Thu Aug 9 03:08:24 2012 New Revision: 1371029 URL: http://svn.apache.org/viewvc?rev=1371029&view=rev Log: hanlde file url when compile jsp Modified: geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Modified: geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1371029&r1=1371028&r2=1371029&view=diff ============================================================================== --- geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java (original) +++ geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java Thu Aug 9 03:08:24 2012 @@ -505,7 +505,7 @@ public abstract class Compiler { try { String key = include.getKey(); URL includeUrl; - if (key.startsWith("jar:")) { + if (key.startsWith("jar:") ||key.startsWith("file:")) { includeUrl = new URL(key); } else { includeUrl = ctxt.getResource(include.getKey());