remm 2004/06/02 03:18:21
Modified: catalina/src/share/org/apache/catalina/session
StandardSession.java
Log:
- Replace "this" with "getSession()" as suggested by Filip.
Revision Changes Path
1.44 +11 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- StandardSession.java 1 Apr 2004 20:18:15 -0000 1.43
+++ StandardSession.java 2 Jun 2004 10:18:20 -0000 1.44
@@ -725,7 +725,7 @@
Object attribute = getAttributeInternal(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
if (event == null)
- event = new HttpSessionEvent(this);
+ event = new HttpSessionEvent(getSession());
try {
((HttpSessionActivationListener)attribute)
.sessionWillPassivate(event);
@@ -751,7 +751,7 @@
Object attribute = getAttributeInternal(keys[i]);
if (attribute instanceof HttpSessionActivationListener) {
if (event == null)
- event = new HttpSessionEvent(this);
+ event = new HttpSessionEvent(getSession());
try {
((HttpSessionActivationListener)attribute)
.sessionDidActivate(event);
@@ -1217,7 +1217,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 (Throwable t){
@@ -1233,7 +1233,7 @@
(unbound instanceof HttpSessionBindingListener)) {
try {
((HttpSessionBindingListener) unbound).valueUnbound
- (new HttpSessionBindingEvent(this, name));
+ (new HttpSessionBindingEvent(getSession(), name));
} catch (Throwable t) {
log(sm.getString("standardSession.bindingEvent"), t);
}
@@ -1256,7 +1256,7 @@
listener);
if (event == null) {
event = new HttpSessionBindingEvent
- (this, name, unbound);
+ (getSession(), name, unbound);
}
listener.attributeReplaced(event);
fireContainerEvent(context,
@@ -1267,7 +1267,8 @@
"beforeSessionAttributeAdded",
listener);
if (event == null) {
- event = new HttpSessionBindingEvent(this, name, value);
+ event = new HttpSessionBindingEvent
+ (getSession(), name, value);
}
listener.attributeAdded(event);
fireContainerEvent(context,
@@ -1561,7 +1562,7 @@
// Call the valueUnbound() method if necessary
HttpSessionBindingEvent event = null;
if (value instanceof HttpSessionBindingListener) {
- event = new HttpSessionBindingEvent(this, name, value);
+ event = new HttpSessionBindingEvent(getSession(), name, value);
((HttpSessionBindingListener) value).valueUnbound(event);
}
@@ -1580,7 +1581,8 @@
"beforeSessionAttributeRemoved",
listener);
if (event == null) {
- event = new HttpSessionBindingEvent(this, name, value);
+ event = new HttpSessionBindingEvent
+ (getSession(), name, value);
}
listener.attributeRemoved(event);
fireContainerEvent(context,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
