Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 988B3200B98 for ; Mon, 3 Oct 2016 15:17:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 971C2160ADC; Mon, 3 Oct 2016 13:17:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DC9AD160ACC for ; Mon, 3 Oct 2016 15:17:21 +0200 (CEST) Received: (qmail 70658 invoked by uid 500); 3 Oct 2016 13:17:20 -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 70648 invoked by uid 99); 3 Oct 2016 13:17:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2016 13:17:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 6A38DC0EEA for ; Mon, 3 Oct 2016 13:17:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 8TzGfeKRxBTY for ; Mon, 3 Oct 2016 13:17:19 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 47D515F245 for ; Mon, 3 Oct 2016 13:17:19 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 6FC4DE01DC for ; Mon, 3 Oct 2016 13:17:18 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6B1723A027B for ; Mon, 3 Oct 2016 13:17:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763167 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Date: Mon, 03 Oct 2016 13:17:18 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161003131718.6B1723A027B@svn01-us-west.apache.org> archived-at: Mon, 03 Oct 2016 13:17:22 -0000 Author: markt Date: Mon Oct 3 13:17:18 2016 New Revision: 1763167 URL: http://svn.apache.org/viewvc?rev=1763167&view=rev Log: Remove additional references to the removed class JndiPermission Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1763167&r1=1763166&r2=1763167&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Oct 3 13:17:18 2016 @@ -284,8 +284,8 @@ public abstract class WebappClassLoaderB /** - * A list of read File and Jndi Permission's required if this loader - * is for a web application context. + * A list of read File Permission's required if this loader is for a web + * application context. */ protected final ArrayList permissionList = new ArrayList<>(); @@ -1301,9 +1301,7 @@ public abstract class WebappClassLoaderB /** * Get the Permissions for a CodeSource. If this instance * of WebappClassLoaderBase is for a web application context, - * add read FilePermission or JndiPermissions for the base - * directory (if unpacked), - * the context URL, and jar file resources. + * add read FilePermission for the appropriate resources. * * @param codeSource where the code was loaded from * @return PermissionCollection for CodeSource --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org