remm 2004/07/23 15:46:08
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java StatusTransformer.java
Log:
- enum -> enumeration (JDK 1.5 update).
Revision Changes Path
1.14 +4 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StatusManagerServlet.java 27 Feb 2004 14:59:07 -0000 1.13
+++ StatusManagerServlet.java 23 Jul 2004 22:46:08 -0000 1.14
@@ -279,9 +279,9 @@
// Display virtual machine statistics
StatusTransformer.writeVMState(writer,mode);
- Enumeration enum = threadPools.elements();
- while (enum.hasMoreElements()) {
- ObjectName objectName = (ObjectName) enum.nextElement();
+ Enumeration enumeration = threadPools.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
String name = objectName.getKeyProperty("name");
// use StatusTransformer to output status
StatusTransformer.writeConnectorState
1.19 +13 -13
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Index: StatusTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StatusTransformer.java 26 May 2004 16:41:54 -0000 1.18
+++ StatusTransformer.java 23 Jul 2004 22:46:08 -0000 1.19
@@ -207,9 +207,9 @@
ObjectName grpName = null;
- Enumeration enum = globalRequestProcessors.elements();
- while (enum.hasMoreElements()) {
- ObjectName objectName = (ObjectName) enum.nextElement();
+ Enumeration enumeration = globalRequestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty("name"))) {
grpName = objectName;
}
@@ -239,9 +239,9 @@
writer.print("<table border=\"0\"><tr><th>Stage</th><th>Time</th><th>B
Sent</th><th>B Recv</th><th>Client</th><th>VHost</th><th>Request</th></tr>");
- enum = requestProcessors.elements();
- while (enum.hasMoreElements()) {
- ObjectName objectName = (ObjectName) enum.nextElement();
+ enumeration = requestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty("worker"))) {
writer.print("<tr>");
writeProcessorState(writer, objectName, mBeanServer, mode);
@@ -267,9 +267,9 @@
ObjectName grpName = null;
- Enumeration enum = globalRequestProcessors.elements();
- while (enum.hasMoreElements()) {
- ObjectName objectName = (ObjectName) enum.nextElement();
+ Enumeration enumeration = globalRequestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty("name"))) {
grpName = objectName;
}
@@ -287,9 +287,9 @@
writer.write(" />");
writer.write("<workers>");
- enum = requestProcessors.elements();
- while (enum.hasMoreElements()) {
- ObjectName objectName = (ObjectName) enum.nextElement();
+ enumeration = requestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty("worker"))) {
writeProcessorState(writer, objectName, mBeanServer, mode);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
