[jboss-cvs] JBossAS SVN: r80159 - in branches/Branch_4_2: security/src/main/org/jboss/security and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 13:29:57 EDT 2008
Author: mmoyses
Date: 2008-10-28 13:29:57 -0400 (Tue, 28 Oct 2008)
New Revision: 80159
Modified:
branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
branches/Branch_4_2/security/src/main/org/jboss/security/SecurityAssociation.java
Log:
EJBTHREE-558: fix memory leak of SubjectContext
Modified: branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
===================================================================
--- branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java 2008-10-28 17:14:50 UTC (rev 80158)
+++ branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java 2008-10-28 17:29:57 UTC (rev 80159)
@@ -85,7 +85,7 @@
if (authenticationManager == null || callerRunAsIdentity == null)
SecurityActions.popSubjectContext();
- if (invocation.getMetaData("security", "principal") != null)
+ if (invocation.getMetaData("security", "principal") != null && !SecurityActions.isServer())
{
SecurityActions.setPrincipal(null);
SecurityActions.setCredential(null);
Modified: branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
===================================================================
--- branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityActions.java 2008-10-28 17:14:50 UTC (rev 80158)
+++ branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityActions.java 2008-10-28 17:29:57 UTC (rev 80159)
@@ -485,11 +485,11 @@
}
}
-
-
-
-
-
+ static boolean isServer()
+ {
+ return SecurityAssociation.isServer();
+ }
+
interface TCLAction
{
class UTIL
Modified: branches/Branch_4_2/security/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- branches/Branch_4_2/security/src/main/org/jboss/security/SecurityAssociation.java 2008-10-28 17:14:50 UTC (rev 80158)
+++ branches/Branch_4_2/security/src/main/org/jboss/security/SecurityAssociation.java 2008-10-28 17:29:57 UTC (rev 80159)
@@ -639,6 +639,11 @@
server = true;
}
+ public static boolean isServer()
+ {
+ return server;
+ }
+
/**
* A subclass of ThreadLocal that implements a value stack using an ArrayList
* and implements push, pop and peek stack operations on the thread local
@@ -922,4 +927,4 @@
}
}
-}
\ No newline at end of file
+}
More information about the jboss-cvs-commits
mailing list