Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17644E54C for ; Thu, 17 Jan 2013 13:21:24 +0000 (UTC) Received: (qmail 94512 invoked by uid 500); 17 Jan 2013 13:21:22 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 94287 invoked by uid 500); 17 Jan 2013 13:21:21 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 94273 invoked by uid 99); 17 Jan 2013 13:21:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 13:21:21 +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, 17 Jan 2013 13:21:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EFE742388847 for ; Thu, 17 Jan 2013 13:21:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1434661 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/servlet/JspCServletContext.java webapps/docs/changelog.xml Date: Thu, 17 Jan 2013 13:21:00 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130117132100.EFE742388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Jan 17 13:21:00 2013 New Revision: 1434661 URL: http://svn.apache.org/viewvc?rev=1434661&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54440 Fix a regression caused by the changes for https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 that broke compilation with JspC. Patch provided by Sheldon Shao. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1434660 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1434661&r1=1434660&r2=1434661&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Thu Jan 17 13:21:00 2013 @@ -1516,7 +1516,7 @@ public class JspC extends Task implement URL urlsA[]=new URL[urls.size()]; urls.toArray(urlsA); loader = new URLClassLoader(urlsA, this.getClass().getClassLoader()); - + context.setClassLoader(loader); } /** Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1434661&r1=1434660&r2=1434661&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Jan 17 13:21:00 2013 @@ -78,9 +78,14 @@ public class JspCServletContext implemen protected URL myResourceBaseURL; - // ----------------------------------------------------------- Constructors + /** + * Web application class loader. + */ + private ClassLoader loader; + // ----------------------------------------------------------- Constructors + /** * Create a new instance of this ServletContext implementation. * @@ -612,7 +617,12 @@ public class JspCServletContext implemen @Override public ClassLoader getClassLoader() { - return null; + return loader; + } + + + public void setClassLoader(ClassLoader loader) { + this.loader = loader; } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1434661&r1=1434660&r2=1434661&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 13:21:00 2013 @@ -67,6 +67,15 @@ + + + + 54440: Correct a regression caused by the changes for + 54240 that broke compilation of JSPs with JspC. Patch + provided by Sheldon Shao. (markt) + + +
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org