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<AsyncListenerWrapper>();
listenersCopy.addAll(listeners);
- ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
- ClassLoader newCL = request.getContext().getLoader().getClassLoader();
+ ClassLoader oldCL;
+ if (Globals.IS_SECURITY_ENABLED) {
+ PrivilegedAction<ClassLoader> 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<Void> 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<Void> pa = new PrivilegedSetTccl(oldCL);
+ AccessController.doPrivileged(pa);
+ } else {
+ Thread.currentThread().setContextClassLoader(oldCL);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
