[jboss-cvs] JBossAS SVN: r61325 - branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security.

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

Author: anil.saldhana at jboss.com
Date: 2007-03-14 12:07:51 -0400 (Wed, 14 Mar 2007)
New Revision: 61325

Modified:
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
Log:
JBAS-4077: place the coyote request on the threadlocal for web programmatic authentication

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java	2007-03-14 13:14:25 UTC (rev 61324)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java	2007-03-14 16:07:51 UTC (rev 61325)
@@ -47,6 +47,7 @@
  *
  * @author Scott.Stark at jboss.org
  * @author Thomas.Diesler at jboss.org
+ * @author Anil.Saldhana at redhat.com
  * @version $Revision$
  */
 public class SecurityAssociationValve extends ValveBase
@@ -55,7 +56,8 @@
    public static ThreadLocal userPrincipal = new ThreadLocal();
    /** Maintain the active WebMetaData for request security checks */
    public static ThreadLocal activeWebMetaData = new ThreadLocal();
-   
+   /** Maintain the Catalina Request for programmatic web login */
+   public static ThreadLocal activeRequest = new ThreadLocal();
 
    /** The web app metadata */
    private WebMetaData metaData;
@@ -100,6 +102,8 @@
          log.trace("Begin invoke, caller"+caller);
       // Set the active meta data
       activeWebMetaData.set(metaData);
+      //Set the active request
+      activeRequest.set(request);
       try
       {
          try
@@ -208,6 +212,7 @@
             log.trace("End invoke, caller"+caller);
          activeWebMetaData.set(null);
          userPrincipal.set(null);
+         activeRequest.set(null);
       }
    }