luehe 2004/09/07 14:45:07
Modified: catalina/src/share/org/apache/catalina/session
ManagerBase.java PersistentManagerBase.java
StandardManager.java
Log:
Consolidated getters and setters for expiredSessions property to ManagerBase
superclass
Revision Changes Path
1.35 +27 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ManagerBase.java 7 Sep 2004 20:57:02 -0000 1.34
+++ ManagerBase.java 7 Sep 2004 21:45:07 -0000 1.35
@@ -160,6 +160,12 @@
/**
+ * Number of sessions that have expired.
+ */
+ protected int expiredSessions = 0;
+
+
+ /**
* The set of currently active Sessions for this Manager, keyed by
* session identifier.
*/
@@ -543,6 +549,26 @@
support.firePropertyChange("randomClass", oldRandomClass,
this.randomClass);
+ }
+
+
+ /**
+ * Gets the number of sessions that have expired.
+ *
+ * @return Number of sessions that have expired
+ */
+ public int getExpiredSessions() {
+ return expiredSessions;
+ }
+
+
+ /**
+ * Sets the number of sessions that have expired.
+ *
+ * @param expiredSessions Number of sessions that have expired
+ */
+ public void setExpiredSessions(int expiredSessions) {
+ this.expiredSessions = expiredSessions;
}
1.21 +2 -19
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
Index: PersistentManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PersistentManagerBase.java 7 Sep 2004 21:11:26 -0000 1.20
+++ PersistentManagerBase.java 7 Sep 2004 21:45:07 -0000 1.21
@@ -199,12 +199,6 @@
/**
- * Number of sessions that expired.
- */
- protected int expiredSessions = 0;
-
-
- /**
* Processing time during session expiration and passivation.
*/
protected long processingTime = 0;
@@ -428,27 +422,16 @@
return rejectedSessions;
}
-
public void setRejectedSessions(int rejectedSessions) {
this.rejectedSessions = rejectedSessions;
}
- /** Number of sessions that expired.
- *
- * @return The count
- */
- public int getExpiredSessions() {
- return expiredSessions;
- }
-
- public void setExpiredSessions(int expiredSessions) {
- this.expiredSessions = expiredSessions;
- }
public long getProcessingTime() {
return processingTime;
}
+
public void setProcessingTime(long processingTime) {
this.processingTime = processingTime;
1.24 +5 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StandardManager.java 7 Sep 2004 20:57:02 -0000 1.23
+++ StandardManager.java 7 Sep 2004 21:45:07 -0000 1.24
@@ -143,12 +143,6 @@
/**
- * Number of sessions that expired.
- */
- protected int expiredSessions = 0;
-
-
- /**
* Processing time during session expiration.
*/
protected long processingTime = 0;
@@ -205,6 +199,7 @@
}
+
/** Number of session creations that failed due to maxActiveSessions
*
* @return The count
@@ -213,29 +208,21 @@
return rejectedSessions;
}
+
public void setRejectedSessions(int rejectedSessions) {
this.rejectedSessions = rejectedSessions;
}
- /** Number of sessions that expired.
- *
- * @return The count
- */
- public int getExpiredSessions() {
- return expiredSessions;
- }
-
- public void setExpiredSessions(int expiredSessions) {
- this.expiredSessions = expiredSessions;
- }
public long getProcessingTime() {
return processingTime;
}
+
public void setProcessingTime(long processingTime) {
this.processingTime = processingTime;
}
+
/**
* Set the maximum number of actives Sessions allowed, or -1 for
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
