amyroh 02/01/25 16:02:16
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Remove unnecessary line and fix comments.
Revision Changes Path
1.20 +4 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StandardServer.java 25 Jan 2002 23:57:55 -0000 1.19
+++ StandardServer.java 26 Jan 2002 00:02:16 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.19 2002/01/25 23:57:55 amyroh Exp $
- * $Revision: 1.19 $
- * $Date: 2002/01/25 23:57:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.20 2002/01/26 00:02:16 amyroh Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/01/26 00:02:16 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* (but not required) when deploying and starting Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.19 $ $Date: 2002/01/25 23:57:55 $
+ * @version $Revision: 1.20 $ $Date: 2002/01/26 00:02:16 $
*/
public final class StandardServer
@@ -348,7 +348,6 @@
public void addService(Service service) {
service.setServer(this);
- Service oldServices[] = this.services;
synchronized (services) {
Service results[] = new Service[services.length + 1];
1.14 +6 -6
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ServerLifecycleListener.java 25 Jan 2002 23:57:55 -0000 1.13
+++ ServerLifecycleListener.java 26 Jan 2002 00:02:16 -0000 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.13 2002/01/25 23:57:55 amyroh Exp $
- * $Revision: 1.13 $
- * $Date: 2002/01/25 23:57:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.14 2002/01/26 00:02:16 amyroh Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/01/26 00:02:16 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.13 $ $Date: 2002/01/25 23:57:55 $
+ * @version $Revision: 1.14 $ $Date: 2002/01/26 00:02:16 $
*/
public class ServerLifecycleListener
@@ -613,14 +613,12 @@
MBeanUtils.createMBean((Manager) newValue);
}
} else if ("realm".equals(propertyName)) {
- // removeService() has non-null oldValue
if (oldValue != null) {
if (debug >= 5) {
log("Removing MBean for Realm " + oldValue);
}
MBeanUtils.destroyMBean((Realm) oldValue);
}
- // addService() has non-null newValue
if (newValue != null) {
if (debug >= 5) {
log("Creating MBean for Realm " + newValue);
@@ -628,12 +626,14 @@
MBeanUtils.createMBean((Realm) newValue);
}
} else if ("service".equals(propertyName)) {
+ // removeService() has non-null oldValue
if (oldValue != null) {
if (debug >= 5) {
log("Removing MBean for Service " + oldValue);
}
MBeanUtils.destroyMBean((Service) oldValue);
}
+ // addService() has non-null newValue
if (newValue != null) {
if (debug >= 5) {
log("Creating MBean for Service " + newValue);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
