[jbossweb-commits] JBossWeb SVN: r985 - in trunk/java/org/apache/catalina: session and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2009-04-03 13:27:27 -0400 (Fri, 03 Apr 2009)
New Revision: 985
Modified:
trunk/java/org/apache/catalina/connector/Request.java
trunk/java/org/apache/catalina/session/StandardSession.java
Log:
- Logout.
- Remove the useless property change.
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2009-04-02 23:32:47 UTC (rev
984)
+++ trunk/java/org/apache/catalina/connector/Request.java 2009-04-03 17:27:27 UTC (rev
985)
@@ -2837,8 +2837,13 @@
}
public void logout() throws ServletException {
- // TODO Auto-generated method stub
-
+ userPrincipal = null;
+ authType = null;
+ Session session = getSessionInternal(false);
+ if (session != null) {
+ session.setPrincipal(null);
+ session.setAuthType(null);
+ }
}
public DispatcherType getDispatcherType() {
Modified: trunk/java/org/apache/catalina/session/StandardSession.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardSession.java 2009-04-02 23:32:47 UTC
(rev 984)
+++ trunk/java/org/apache/catalina/session/StandardSession.java 2009-04-03 17:27:27 UTC
(rev 985)
@@ -19,7 +19,6 @@
package org.apache.catalina.session;
-import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
@@ -54,11 +53,10 @@
import org.apache.catalina.Session;
import org.apache.catalina.SessionEvent;
import org.apache.catalina.SessionListener;
+import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.security.SecurityUtil;
-
/**
* Standard implementation of the <b>Session</b> interface. This object is
* serializable, so that it can be stored in persistent storage or transferred
@@ -269,14 +267,6 @@
/**
- * The property change support for this component. NOTE: This value
- * is not included in the serialized version of this object.
- */
- protected transient PropertyChangeSupport support =
- new PropertyChangeSupport(this);
-
-
- /**
* The current accessed time for this session.
*/
protected int thisAccessedTime = 0;
@@ -310,9 +300,7 @@
*/
public void setAuthType(String authType) {
- String oldAuthType = this.authType;
this.authType = authType;
- support.firePropertyChange("authType", oldAuthType, this.authType);
}
@@ -538,9 +526,7 @@
*/
public void setPrincipal(Principal principal) {
- Principal oldPrincipal = this.principal;
this.principal = principal;
- support.firePropertyChange("principal", oldPrincipal, this.principal);
}