You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2004/06/02 16:10:01 UTC
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java SimpleTcpReplicationManager.java
fhanik 2004/06/02 07:10:01
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java SimpleTcpReplicationManager.java
Log:
Fixed the session facade for events
Fixed the deserialization to only add the session to the manager once
Revision Changes Path
1.24 +6 -6 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Index: DeltaSession.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DeltaSession.java 26 May 2004 16:37:47 -0000 1.23
+++ DeltaSession.java 2 Jun 2004 14:10:01 -0000 1.24
@@ -1279,7 +1279,7 @@
// Call the valueBound() method if necessary
if ( value instanceof HttpSessionBindingListener ) {
- event = new HttpSessionBindingEvent(this, name, value);
+ event = new HttpSessionBindingEvent(getSession(), name, value);
try {
( (HttpSessionBindingListener) value).valueBound(event);
} catch ( Exception x ) {
@@ -1295,7 +1295,7 @@
(unbound instanceof HttpSessionBindingListener)) {
try {
( (HttpSessionBindingListener) unbound).valueUnbound
- (new HttpSessionBindingEvent( (HttpSession)this, name));
+ (new HttpSessionBindingEvent( (HttpSession)getSession(), name));
} catch ( Exception x ) {
log.error("Session binding listener throw an exception",x);
}
@@ -1322,7 +1322,7 @@
listener);
if (event == null) {
event = new HttpSessionBindingEvent
- (this, name, unbound);
+ (getSession(), name, unbound);
}
listener.attributeReplaced(event);
fireContainerEvent(context,
@@ -1334,7 +1334,7 @@
listener);
if (event == null) {
event = new HttpSessionBindingEvent
- (this, name, unbound);
+ (getSession(), name, unbound);
}
listener.attributeAdded(event);
fireContainerEvent(context,
@@ -1614,7 +1614,7 @@
// Call the valueUnbound() method if necessary
HttpSessionBindingEvent event =
- new HttpSessionBindingEvent((HttpSession) this, name, value);
+ new HttpSessionBindingEvent((HttpSession) getSession(), name, value);
if ((value != null) &&
(value instanceof HttpSessionBindingListener))
try {
1.28 +0 -2 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SimpleTcpReplicationManager.java 29 May 2004 02:48:16 -0000 1.27
+++ SimpleTcpReplicationManager.java 2 Jun 2004 14:10:01 -0000 1.28
@@ -547,8 +547,6 @@
String id = oin.readUTF();
byte[] data = (byte[])oin.readObject();
Session session = readSession(data,id);
- session.setManager(this);
- add(session);
}//for
stateTransferred=true;
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org