amyroh 2002/09/20 14:20:44
Modified: catalina/src/share/org/apache/catalina/loader
WebappLoader.java
catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Add missing handling of PropertyChangeEvent for DefaultContext.
Revision Changes Path
1.30 +7 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Index: WebappLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- WebappLoader.java 19 Sep 2002 22:55:48 -0000 1.29
+++ WebappLoader.java 20 Sep 2002 21:20:44 -0000 1.30
@@ -184,7 +184,7 @@
/**
- * The DefaultContext with which this Manager is associated.
+ * The DefaultContext with which this Loader is associated.
*/
protected DefaultContext defaultContext = null;
@@ -348,7 +348,7 @@
/**
- * Return the DefaultContext with which this Manager is associated.
+ * Return the DefaultContext with which this Loader is associated.
*/
public DefaultContext getDefaultContext() {
@@ -358,7 +358,7 @@
/**
- * Set the DefaultContext with which this Manager is associated.
+ * Set the DefaultContext with which this Loader is associated.
*
* @param defaultContext The newly associated DefaultContext
*/
1.35 +15 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ServerLifecycleListener.java 19 Sep 2002 22:55:48 -0000 1.34
+++ ServerLifecycleListener.java 20 Sep 2002 21:20:44 -0000 1.35
@@ -265,7 +265,17 @@
} catch (Exception e) {
log("Exception handling Container property change", e);
}
- } else if (event.getSource() instanceof NamingResources) {
+ } else if (event.getSource() instanceof DefaultContext) {
+ try {
+ processDefaultContextPropertyChange
+ ((DefaultContext) event.getSource(),
+ event.getPropertyName(),
+ event.getOldValue(),
+ event.getNewValue());
+ } catch (Exception e) {
+ log("Exception handling DefaultContext property change", e);
+ }
+ } else if (event.getSource() instanceof NamingResources) {
try {
processNamingResourcesPropertyChange
((NamingResources) event.getSource(),
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
