cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java SimpleTcpReplicationManager.java
fhanik 2004/05/28 11:49:37
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
SimpleTcpReplicationManager.java
Log:
using the logger instead of the old debug flag
Revision ChangesPath
1.14 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ReplicatedSession.java27 May 2004 15:11:21 - 1.13
+++ ReplicatedSession.java28 May 2004 18:49:37 - 1.14
@@ -239,7 +239,7 @@
protected void log(String message) {
if ((mManager != null) (mManager instanceof
SimpleTcpReplicationManager)) {
-((SimpleTcpReplicationManager) mManager).log(message);
+((SimpleTcpReplicationManager) mManager).log.debug(ReplicatedSession:
+ message);
} else {
System.out.println(ReplicatedSession: + message);
}
@@ -249,7 +249,7 @@
protected void log(String message, Throwable x) {
if ((mManager != null) (mManager instanceof
SimpleTcpReplicationManager)) {
-((SimpleTcpReplicationManager) mManager).log(message,x);
+((SimpleTcpReplicationManager) mManager).log.error(ReplicatedSession:
+ message,x);
} else {
System.out.println(ReplicatedSession: + message);
x.printStackTrace();
1.25 +16 -52
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Index: SimpleTcpReplicationManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SimpleTcpReplicationManager.java 27 May 2004 15:11:21 - 1.24
+++ SimpleTcpReplicationManager.java 28 May 2004 18:49:37 - 1.25
@@ -97,8 +97,6 @@
protected String name;
-protected int debug = 0;
-
protected boolean distributable = true;
protected CatalinaCluster cluster;
@@ -137,7 +135,7 @@
}
public void setCluster(CatalinaCluster cluster) {
-this.log(Cluster associated with SimpleTcpReplicationManager);
+this.log.debug(Cluster associated with SimpleTcpReplicationManager);
this.cluster = cluster;
}
@@ -148,7 +146,7 @@
public void setPrintToScreen(boolean printtoscreen)
{
-log(Setting screen debug to:+printtoscreen);
+log.debug(Setting screen debug to:+printtoscreen);
mPrintToScreen = printtoscreen;
}
@@ -166,15 +164,6 @@
}
}
-public int getDebug()
-{
-return this.debug;
-}
-
-public void setDebug(int debug) {
-this.debug = debug;
-//super.setDebug(debug);
-}
/**
* Creates a HTTP session.
* Most of the code in here is copied from the StandardManager.
@@ -314,7 +303,7 @@
}
session.setIsDirty(false);
-if (getDebug() 5) {
+if (log.isDebugEnabled()) {
try {
log.debug(Sending session to cluster= + session);
}
@@ -330,7 +319,7 @@
}
catch (Exception x )
{
-log(Unable to replicate session,x);
+log.error(Unable to replicate session,x);
}
return null;
}
@@ -361,7 +350,7 @@
}
catch ( Exception x )
{
-log(Failed to serialize the session!,x,1);
+log.error(Failed to serialize the session!,x);
}
return null;
}
@@ -422,7 +411,7 @@
}
catch ( Exception x )
{
-log(Failed to deserialize the session!,x,1);
+log.error(Failed to deserialize the session!,x);
}
return null;
}
@@ -448,9 +437,9 @@
try {
//the channel is already running
if ( mChannelStarted ) return;
-log(Starting clustering manager...:+getName(),1);
+log.error(Starting clustering manager...:+getName());
if ( cluster == null ) {
-log(Starting... no cluster associated with this
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java
yoavs 2004/05/26 09:37:51
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.12 +1 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ReplicatedSession.java27 Feb 2004 14:58:56 - 1.11
+++ ReplicatedSession.java26 May 2004 16:37:51 - 1.12
@@ -139,7 +139,6 @@
* codeRealm.authenticate()/code calls on every request.
*
* @param principal The new Principal, or codenull/code if none
- * @param jgnotify notify the other nodes in the cluster? (true/false)
*/
public void setPrincipal(Principal principal) {
super.setPrincipal(principal);
@@ -202,7 +201,6 @@
/**
* returns true if this session is the primary session, if that is the
* case, the manager can expire it upon timeout.
- * @return
*/
public boolean isPrimarySession() {
return isPrimarySession;
@@ -210,7 +208,7 @@
/**
* Sets whether this is the primary session or not.
- * @param primarySession
+ * @param primarySession Flag value
*/
public void setPrimarySession(boolean primarySession) {
this.isPrimarySession=primarySession;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java
fhanik 2003/11/14 13:32:23
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
Log:
if null is passed into the value of setAttribute, then remove it
Revision ChangesPath
1.8 +8 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReplicatedSession.java9 Sep 2003 22:21:18 - 1.7
+++ ReplicatedSession.java14 Nov 2003 21:32:23 - 1.8
@@ -123,7 +123,7 @@
public void setLastAccessWasDistributed(long time) {
lastAccessWasDistributed = time;
}
-
+
public long getLastAccessWasDistributed() {
return lastAccessWasDistributed;
}
@@ -149,6 +149,10 @@
*/
public void setAttribute(String name, Object value)
{
+if ( value == null ) {
+ removeAttribute(name);
+ return;
+}
if (!(value instanceof java.io.Serializable))
throw new java.lang.IllegalArgumentException(Value for attribute
+name+ is not serializable.);
setIsDirty(true);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java
fhanik 2003/08/26 13:45:04
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
Log:
set dirty flag gets set on setMaxInactiveInterval
Revision ChangesPath
1.6 +8 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ReplicatedSession.java16 Apr 2003 18:49:22 - 1.5
+++ ReplicatedSession.java26 Aug 2003 20:45:04 - 1.6
@@ -147,6 +147,11 @@
super.setAttribute(name,value);
}
+public void setMaxInactiveInterval(int interval) {
+setIsDirty(true);
+super.setMaxInactiveInterval(interval);
+}
+
/**
* Sets the manager for this session
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java
fhanik 2003/04/04 11:43:47
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
Log:
servlet 2.4 spec requires setAttribute to throw an exception if attribute is not
serializable
Revision ChangesPath
1.4 +5 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReplicatedSession.java18 Mar 2003 05:16:42 - 1.3
+++ ReplicatedSession.java4 Apr 2003 19:43:47 - 1.4
@@ -141,10 +141,10 @@
*/
public void setAttribute(String name, Object value)
{
+if (!(value instanceof java.io.Serializable))
+throw new java.lang.IllegalArgumentException(Value for attribute
+name+ is not serializable.);
setIsDirty(true);
super.setAttribute(name,value);
-if (!(value instanceof java.io.Serializable))
-log(WARNING! Replication will fail, value for attribute +name+ is
not serializable.);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session ReplicatedSession.java
fhanik 2003/03/17 21:16:43
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicatedSession.java
Log:
setting dirty flag on remove Attribute, forgot to override this method
Revision ChangesPath
1.3 +7 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplicatedSession.java25 Feb 2003 21:15:12 - 1.2
+++ ReplicatedSession.java18 Mar 2003 05:16:42 - 1.3
@@ -121,6 +121,10 @@
+public void removeAttribute(String name) {
+setIsDirty(true);
+super.removeAttribute(name);
+}
/**
* see parent description,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
