Author: pero
Date: Fri Mar 10 07:27:43 2006
New Revision: 384817
URL: http://svn.apache.org/viewcvs?rev=384817&view=rev
Log:
Fix SingleSignOn Valve and add Session.getLastAccessTimeInternal() without
session invalidation test.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Session.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
tomcat/container/tc5.5.x/modules/cluster/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Session.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Session.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Session.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/Session.java
Fri Mar 10 07:27:43 2006
@@ -133,6 +133,11 @@
*/
public long getLastAccessedTime();
+ /**
+ * Return the last client access time without invalidation check
+ * @see #getLastAccessedTime().
+ */
+ public long getLastAccessedTimeInternal();
/**
* Return the Manager within which this Session is valid.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java
Fri Mar 10 07:27:43 2006
@@ -321,7 +321,7 @@
// SSO. If the session was logged out, we'll log out
// of all session associated with the SSO.
if (((session.getMaxInactiveInterval() > 0)
- && (System.currentTimeMillis() - session.getLastAccessedTime() >=
+ && (System.currentTimeMillis() -
session.getLastAccessedTimeInternal() >=
session.getMaxInactiveInterval() * 1000))
|| (Session.SESSION_PASSIVATED_EVENT.equals(event.getType()))) {
removeSession(ssoId, session);
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
Fri Mar 10 07:27:43 2006
@@ -430,6 +430,13 @@
return (this.lastAccessedTime);
}
+ /**
+ * Return the last client access time without invalidation check
+ * @see #getLastAccessedTime().
+ */
+ public long getLastAccessedTimeInternal() {
+ return (this.lastAccessedTime);
+ }
/**
* Return the Manager within which this Session is valid.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Fri Mar 10 07:27:43 2006
@@ -445,6 +445,14 @@
}
/**
+ * Return the last client access time without invalidation check
+ * @see #getLastAccessedTime().
+ */
+ public long getLastAccessedTimeInternal() {
+ return (this.lastAccessedTime);
+ }
+
+ /**
* Return the Manager within which this Session is valid.
*/
public Manager getManager() {
Modified:
tomcat/container/tc5.5.x/modules/cluster/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/cluster/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
Fri Mar 10 07:27:43 2006
@@ -38,7 +38,7 @@
} catch (Exception sleep) {
}
long timeNow = System.currentTimeMillis();
- int timeIdle = (int) ((timeNow - session.getLastAccessedTime()) /
1000L);
+ int timeIdle = (int) ((timeNow -
session.getLastAccessedTimeInternal()) / 1000L);
assertEquals(2,timeIdle);
assertTrue(timeIdle > session.getMaxInactiveInterval());
assertFalse(session.isValid()) ;
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
Fri Mar 10 07:27:43 2006
@@ -425,6 +425,14 @@
}
/**
+ * Return the last client access time without invalidation check
+ * @see #getLastAccessedTime().
+ */
+ public long getLastAccessedTimeInternal() {
+ return (this.lastAccessedTime);
+ }
+
+ /**
* Return the Manager within which this Session is valid.
*/
public Manager getManager() {
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=384817&r1=384816&r2=384817&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Mar 10 07:27:43 2006
@@ -18,6 +18,9 @@
<subsection name="Catalina">
<changelog>
<fix>
+ Fix SingleSignOn Valve and add Session.getLastAccessTimeInternal()
without session invalidation test. (pero)
+ </fix>
+ <fix>
<bug>38814</bug>: CGIServlet correctly handles Shift_JIS output.
(markt)
</fix>
<fix>
@@ -33,7 +36,14 @@
</fix>
</changelog>
</subsection>
-</section>
+ <subsection name="Cluster">
+ <changelog>
+ <update>
+ Add DeltaSession.getLastAccessTimeInternal() without session
invalidation test. (pero)
+ </update>
+ </changelog>
+ </subsection>
+ </section>
<section name="Tomcat 5.5.16 (yoavs)">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
