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 33FEDDC7E for ; Fri, 16 Nov 2012 16:57:58 +0000 (UTC) Received: (qmail 5773 invoked by uid 500); 16 Nov 2012 16:57:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 5595 invoked by uid 500); 16 Nov 2012 16:57:56 -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 5579 invoked by uid 99); 16 Nov 2012 16:57:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 16:57:56 +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; Fri, 16 Nov 2012 16:57:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 49C6A23888EA for ; Fri, 16 Nov 2012 16:57:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1410468 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AsyncContextImpl.java Date: Fri, 16 Nov 2012 16:57:32 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121116165733.49C6A23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Nov 16 16:57:31 2012 New Revision: 1410468 URL: http://svn.apache.org/viewvc?rev=1410468&view=rev Log: Make sure onComplete() works when running with a security manager Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1410466 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1410468&r1=1410467&r2=1410468&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Nov 16 16:57:31 2012 @@ -98,11 +98,22 @@ public class AsyncContextImpl implements new ArrayList(); listenersCopy.addAll(listeners); - ClassLoader oldCL = Thread.currentThread().getContextClassLoader(); - ClassLoader newCL = request.getContext().getLoader().getClassLoader(); + ClassLoader oldCL; + if (Globals.IS_SECURITY_ENABLED) { + PrivilegedAction pa = new PrivilegedGetTccl(); + oldCL = AccessController.doPrivileged(pa); + } else { + oldCL = Thread.currentThread().getContextClassLoader(); + } + ClassLoader newCL = context.getLoader().getClassLoader(); try { - Thread.currentThread().setContextClassLoader(newCL); + if (Globals.IS_SECURITY_ENABLED) { + PrivilegedAction pa = new PrivilegedSetTccl(newCL); + AccessController.doPrivileged(pa); + } else { + Thread.currentThread().setContextClassLoader(newCL); + } for (AsyncListenerWrapper listener : listenersCopy) { try { listener.fireOnComplete(event); @@ -112,7 +123,12 @@ public class AsyncContextImpl implements } } } finally { - Thread.currentThread().setContextClassLoader(oldCL); + if (Globals.IS_SECURITY_ENABLED) { + PrivilegedAction pa = new PrivilegedSetTccl(oldCL); + AccessController.doPrivileged(pa); + } else { + Thread.currentThread().setContextClassLoader(oldCL); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org