yoavs 2004/09/03 11:21:29
Modified: catalina/src/share/org/apache/catalina/core Tag: TOMCAT_5_0
StandardDefaultContext.java
catalina/src/share/org/apache/naming/factory Tag: TOMCAT_5_0
BeanFactory.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 29914, typo fix in BeanFactory
Revision Changes Path
No revision
No revision
1.15.2.1 +19 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/Attic/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/Attic/StandardDefaultContext.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- StandardDefaultContext.java 26 May 2004 15:36:35 -0000 1.15
+++ StandardDefaultContext.java 3 Sep 2004 18:21:28 -0000 1.15.2.1
@@ -867,6 +867,14 @@
}
+ /**
+ * Get the lifecycle listeners associated with this lifecycle. If this
+ * Lifecycle has no listeners registered, a zero-length array is returned.
+ */
+ public LifecycleListener[] findLifecycleListeners() {
+ return (LifecycleListener[]) lifecycle.toArray(new
LifecycleListener[lifecycle.size()]);
+ }
+
/**
* Return the set of application listener class names configured
@@ -1095,6 +1103,16 @@
}
+ /**
+ * Remove a lifecycle event listener from this component.
+ *
+ * @param listener The listener to remove
+ */
+ public void removeLifecycleListener(LifecycleListener listener) {
+ if((lifecycle != null) && (listener != null)) {
+ lifecycle.remove(listener);
+ }
+ }
/**
* Remove the specified application listener class from the set of
No revision
No revision
1.2.2.3 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java
Index: BeanFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- BeanFactory.java 3 Sep 2004 18:06:23 -0000 1.2.2.2
+++ BeanFactory.java 3 Sep 2004 18:21:28 -0000 1.2.2.3
@@ -225,7 +225,7 @@
throw ne;
} catch (java.lang.IllegalAccessException iae) {
NamingException ne = new NamingException(iae.getMessage());
- ne.setRootause(iae);
+ ne.setRootCause(iae);
throw ne;
} catch (java.lang.InstantiationException ie2) {
NamingException ne = new NamingException(ie2.getMessage());
No revision
No revision
1.70.2.31 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.30
retrieving revision 1.70.2.31
diff -u -r1.70.2.30 -r1.70.2.31
--- changelog.xml 3 Sep 2004 18:06:23 -0000 1.70.2.30
+++ changelog.xml 3 Sep 2004 18:21:28 -0000 1.70.2.31
@@ -63,6 +63,9 @@
<fix>
<bug>31052</bug>: BeanFactory swallows root cause of exception. (yoavs)
</fix>
+ <fix>
+ <bug>29914</bug>: Better lifecycle support for DefaultContext. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
