jfarcand 2004/08/20 07:28:38
Modified: catalina/src/share/org/apache/catalina/security Tag:
TOMCAT_5_0 SecurityUtil.java
Log:
Fix for Bugzilla 30602: Subject is not available during the first call to the
servlet which use the basic authentication.
All Servlet TCKs passed with Security enabled
Submitted by: Josip Jureta at videotron.ca
Revision Changes Path
No revision
No revision
1.11.2.1 +9 -7
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.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- SecurityUtil.java 26 May 2004 15:53:20 -0000 1.11
+++ SecurityUtil.java 20 Aug 2004 14:28:38 -0000 1.11.2.1
@@ -251,16 +251,18 @@
if (session != null){
subject =
(Subject)session.getAttribute(Globals.SUBJECT_ATTR);
+ }
- if (subject == null){
- subject = new Subject();
-
- if (principal != null){
- subject.getPrincipals().add(principal);
- }
- session.setAttribute(Globals.SUBJECT_ATTR, subject);
+ if (subject == null){
+ subject = new Subject();
+
+ if (principal != null){
+ subject.getPrincipals().add(principal);
}
}
+
+ if (session != null)
+ session.setAttribute(Globals.SUBJECT_ATTR, subject);
}
Subject.doAsPrivileged(subject, pea, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
