Author: markt
Date: Sat Apr 10 12:44:17 2010
New Revision: 932711
URL: http://svn.apache.org/viewvc?rev=932711&view=rev
Log:
Remove generics added in r932276
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java?rev=932711&r1=932710&r2=932711&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/StandardSession.java
Sat Apr 10 12:44:17 2010
@@ -695,7 +695,7 @@ public class StandardSession
context.getLoader().getClassLoader() != null) {
oldTccl = Thread.currentThread().getContextClassLoader();
if (System.getSecurityManager() != null) {
- PrivilegedAction<Void> pa = new PrivilegedSetTccl(
+ PrivilegedAction pa = new PrivilegedSetTccl(
context.getLoader().getClassLoader());
AccessController.doPrivileged(pa);
} else {
@@ -734,7 +734,7 @@ public class StandardSession
} finally {
if (oldTccl != null) {
if (System.getSecurityManager() != null) {
- PrivilegedAction<Void> pa = new PrivilegedSetTccl(
+ PrivilegedAction pa = new PrivilegedSetTccl(
oldTccl);
AccessController.doPrivileged(pa);
} else {
@@ -1714,7 +1714,7 @@ public class StandardSession
}
- private static class PrivilegedSetTccl implements PrivilegedAction<Void> {
+ private static class PrivilegedSetTccl implements PrivilegedAction {
private ClassLoader cl;
@@ -1722,7 +1722,7 @@ public class StandardSession
this.cl = cl;
}
- public Void run() {
+ public Object run() {
Thread.currentThread().setContextClassLoader(cl);
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
