[jboss-cvs] JBossAS SVN: r80148 - in branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347: security/src/main/org/jboss/security and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2008-10-28 10:25:19 -0400 (Tue, 28 Oct 2008)
New Revision: 80148

Modified:
   branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
   branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
   branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/security/src/main/org/jboss/security/SecurityAssociation.java
Log:
JBPAPP-1347: fixing memory leak of SubjectContext

Modified: branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java	2008-10-28 14:02:39 UTC (rev 80147)
+++ branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java	2008-10-28 14:25:19 UTC (rev 80148)
@@ -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/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/SecurityActions.java	2008-10-28 14:02:39 UTC (rev 80147)
+++ branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/aspects/src/main/org/jboss/aspects/security/SecurityActions.java	2008-10-28 14:25:19 UTC (rev 80148)
@@ -485,11 +485,11 @@
       }      
    }
 
-   
-   
-   
-   
-   
+   static boolean isServer()
+   {
+      return SecurityAssociation.isServer();
+   }
+      
    interface TCLAction
    {
       class UTIL

Modified: branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/security/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/security/src/main/org/jboss/security/SecurityAssociation.java	2008-10-28 14:02:39 UTC (rev 80147)
+++ branches/JBPAPP_4_3_0_GA_CP02_JBPAPP-1347/security/src/main/org/jboss/security/SecurityAssociation.java	2008-10-28 14:25:19 UTC (rev 80148)
@@ -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
+}