Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 11111 invoked from network); 1 Sep 2006 14:00:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Sep 2006 14:00:23 -0000 Received: (qmail 55708 invoked by uid 500); 1 Sep 2006 14:00:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 55650 invoked by uid 500); 1 Sep 2006 14:00:16 -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 55639 invoked by uid 500); 1 Sep 2006 14:00:16 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 55636 invoked by uid 99); 1 Sep 2006 14:00:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2006 07:00:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2006 07:00:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 37DC81A981A; Fri, 1 Sep 2006 06:59:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439324 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Date: Fri, 01 Sep 2006 13:59:55 -0000 To: tomcat-dev@jakarta.apache.org From: remm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060901135956.37DC81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: remm Date: Fri Sep 1 06:59:55 2006 New Revision: 439324 URL: http://svn.apache.org/viewvc?rev=439324&view=rev Log: - Port patch so that getParentCL returns something consistent with the privileged flag. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=439324&r1=439323&r2=439324&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri Sep 1 06:59:55 2006 @@ -1538,6 +1538,24 @@ this.originalDocBase = docBase; } + + /** + * Return the parent class loader (if any) for this web application. + * This call is meaningful only after a Loader has + * been configured. + */ + public ClassLoader getParentClassLoader() { + if (parentClassLoader != null) + return (parentClassLoader); + if (getPrivileged()) { + return this.getClass().getClassLoader(); + } else if (parent != null) { + return (parent.getParentClassLoader()); + } + return (ClassLoader.getSystemClassLoader()); + } + + /** * Return the privileged flag for this web application. */ @@ -4117,17 +4135,7 @@ } if (getLoader() == null) { - ClassLoader parent = null; - if (getPrivileged()) { - if (log.isDebugEnabled()) - log.debug("Configuring privileged default Loader"); - parent = this.getClass().getClassLoader(); - } else { - if (log.isDebugEnabled()) - log.debug("Configuring non-privileged default Loader"); - parent = getParentClassLoader(); - } - WebappLoader webappLoader = new WebappLoader(parent); + WebappLoader webappLoader = new WebappLoader(getParentClassLoader()); webappLoader.setDelegate(getDelegate()); setLoader(webappLoader); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org