From 682474deb1300e84402445070eef2194f94b5799 Mon Sep 17 00:00:00 2001
From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 17 Jan 2008 20:43:43 +0000
Subject: [PATCH] Add getLastAccessedTimestamp and getCreationTimestamp for
 remote JMX Access.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@612971 13f79535-47bb-0310-9956-ffa450edef68
---
 .../catalina/ha/session/mbeans-descriptors.xml     | 16 ++++++++++
 java/org/apache/catalina/session/ManagerBase.java  | 15 ++++++++-
 .../apache/catalina/session/mbeans-descriptors.xml | 36 ++++++++++++++++++++++
 webapps/docs/changelog.xml                         |  4 +++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index 7fed3b2ee..4da1d84e8 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -342,6 +342,22 @@ created by this Manager"
         description="Id of the session"
         type="java.lang.String"/>
     </operation>
+    <operation   name="getLastAccessedTimestamp"
+          description="Get the last access timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
+    <operation   name="getCreationTimestamp"
+          description="Get the creation timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
     <operation
       name="expireAllLocalSessions"
       description="Exipre all active local sessions and replicate the invalid sessions"
diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 9f3c1311e..f528716fb 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -1203,7 +1203,13 @@ public abstract class ManagerBase implements Manager, MBeanRegistration {
         s.expire();
     }
 
-
+    public long getLastAccessedTimestamp( String sessionId ) {
+        Session s=(Session)sessions.get(sessionId);
+        if(s== null)
+            return -1 ;
+        return s.getLastAccessedTime();
+    }
+  
     public String getLastAccessedTime( String sessionId ) {
         Session s=(Session)sessions.get(sessionId);
         if( s==null ) {
@@ -1224,6 +1230,13 @@ public abstract class ManagerBase implements Manager, MBeanRegistration {
         return new Date(s.getCreationTime()).toString();
     }
 
+    public long getCreationTimestamp( String sessionId ) {
+        Session s=(Session)sessions.get(sessionId);
+        if(s== null)
+            return -1 ;
+        return s.getCreationTime();
+    }
+
     // -------------------- JMX and Registration  --------------------
     protected String domain;
     protected ObjectName oname;
diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml
index 2d0692f45..20fe96a9f 100644
--- a/java/org/apache/catalina/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/session/mbeans-descriptors.xml
@@ -160,6 +160,24 @@
                  type="java.lang.String"/>
     </operation>
 
+   <operation   name="getLastAccessedTimestamp"
+          description="Get the last access timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
+
+    <operation   name="getCreationTimestamp"
+          description="Get the creation timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
+
   </mbean>
 
   <mbean         name="PersistentManager"
@@ -321,6 +339,24 @@
                  type="java.lang.String"/>
     </operation>
 
+    <operation   name="getLastAccessedTimestamp"
+          description="Get the last access timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
+
+    <operation   name="getCreationTimestamp"
+          description="Get the creation timestamp"
+               impact="ACTION"
+           returnType="long">
+      <parameter name="sessionId"
+          description="Id of the session"
+                 type="java.lang.String"/>
+    </operation>
+
   </mbean>
 
 </mbeans-descriptors>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fe0049d2e..e3384c3db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -46,6 +46,10 @@
   </subsection>
   <subsection name="Catalina">
     <changelog>
+      <add>
+        Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp for better
+        remote JMX access. (pero)
+      </add>
       <fix>
         Set correct StandardManager.sessionCounter after reload/restart. (pero)
       </fix>
-- 
2.11.0