jfarcand 2003/09/10 20:56:48
Modified: catalina/src/share/org/apache/coyote/tomcat5
CoyoteRequest.java
Log:
Oups forgot that one (See previous commit)
Revision Changes Path
1.16 +10 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CoyoteRequest.java 31 Aug 2003 21:08:56 -0000 1.15
+++ CoyoteRequest.java 11 Sep 2003 03:56:48 -0000 1.16
@@ -1767,15 +1767,18 @@
public void setUserPrincipal(Principal principal) {
if (System.getSecurityManager() != null){
+ HttpSession session = getSession(false);
if ( (subject != null) &&
(!subject.getPrincipals().contains(principal)) ){
subject.getPrincipals().add(principal);
- } else if (getSession()
- .getAttribute(Globals.SUBJECT_ATTR) == null) {
+ } else if (session != null &&
+ session.getAttribute(Globals.SUBJECT_ATTR) == null) {
subject = new Subject();
subject.getPrincipals().add(principal);
}
- getSession().setAttribute(Globals.SUBJECT_ATTR, subject);
+ if (session != null){
+ session.setAttribute(Globals.SUBJECT_ATTR, subject);
+ }
}
this.userPrincipal = principal;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
