jfarcand    2003/09/10 14:28:37

  Modified:    catalina/src/share/org/apache/catalina/security
                        SecurityUtil.java
  Log:
  Do not create session when no one is available.
  
  Revision  Changes    Path
  1.8       +9 -5      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security/SecurityUtil.java
  
  Index: SecurityUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/security/SecurityUtil.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SecurityUtil.java 10 Sep 2003 16:56:45 -0000      1.7
  +++ SecurityUtil.java 10 Sep 2003 21:28:37 -0000      1.8
  @@ -73,6 +73,7 @@
   import javax.servlet.ServletException;
   import javax.servlet.UnavailableException;
   import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpSession;
   
   import org.apache.catalina.Globals;
   import org.apache.catalina.util.StringManager;
  @@ -290,12 +291,15 @@
                       && targetArguments[0] instanceof HttpServletRequest){
                   HttpServletRequest request = 
                       (HttpServletRequest)targetArguments[0];
  -                subject = (Subject)request.getSession()
  -                                        .getAttribute(Globals.SUBJECT_ATTR);
   
  -                if (subject == null){
  -                    subject = new Subject();
  -                    request.getSession().setAttribute(Globals.SUBJECT_ATTR, 
subject);
  +                HttpSession session = request.getSession(false);
  +                if (session != null){
  +                    subject = (Subject)session.getAttribute(Globals.SUBJECT_ATTR);
  +
  +                    if (subject == null){
  +                        subject = new Subject();
  +                        session.setAttribute(Globals.SUBJECT_ATTR, subject);
  +                    }
                   }
               }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to