You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2007/10/17 14:42:30 UTC
svn commit: r585465 - in /tomcat/connectors/trunk/jk:
jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
xdocs/miscellaneous/changelog.xml
Author: pero
Date: Wed Oct 17 05:42:28 2007
New Revision: 585465
URL: http://svn.apache.org/viewvc?rev=585465&view=rev
Log:
Fix correct parameter validation at JkStatusUpdateTask and JkStatusUpdateLoadbalancerTask ant tasks.
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java?rev=585465&r1=585464&r2=585465&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java Wed Oct 17 05:42:28 2007
@@ -233,14 +233,14 @@
* <li><b>lx:<b/> max reply timeouts</li>
* </ul>
* <ul>
- * <li>lm=1 or Requests</li>
- * <li>lm=2 or Traffic</li>
- * <li>lm=3 or Busyness</li>
- * <li>lm=4 or Sessions</li>
+ * <li>lm=0 or Requests</li>
+ * <li>lm=1 or Traffic</li>
+ * <li>lm=2 or Busyness</li>
+ * <li>lm=3 or Sessions</li>
* </ul>
* <ul>
- * <li>ll=1 or Optimistic</li>
- * <li>ll=2 or Pessimistic</li>
+ * <li>ll=0 or Optimistic</li>
+ * <li>ll=1 or Pessimistic</li>
* </ul>
*
* @return create jkstatus update worker link
@@ -268,7 +268,7 @@
sb.append("<=");
sb.append(recoverWaitTime);
}
- if (method == null && methodCode > 0 && methodCode < 5) {
+ if (method == null && methodCode >= 0 && methodCode < 4) {
sb.append("&lm=");
sb.append(methodCode);
}
@@ -276,7 +276,7 @@
sb.append("&lm=");
sb.append(method);
}
- if (lock == null && lockCode > 0 && lockCode < 3) {
+ if (lock == null && lockCode >= 0 && lockCode < 2) {
sb.append("&ll=");
sb.append(lockCode);
}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java?rev=585465&r1=585464&r2=585465&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java Wed Oct 17 05:42:28 2007
@@ -282,9 +282,9 @@
/**
* <ul>
- * <li>1 active</li>
- * <li>2 disabled</li>
- * <li>3 stopped</li>
+ * <li>0 active</li>
+ * <li>1 disabled</li>
+ * <li>2 stopped</li>
* </ul>
* @param workerActivation The workerActivation to set.
*
@@ -358,12 +358,12 @@
* <li><b>load balance example:
* </b>http://localhost/jkstatus?cmd=update&mime=txt&w=lb&lf=false&ls=true</li>
* <li><b>worker example:
- * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=node1&wn=node01&l=lb&wf=1&wa=1&wx=0
+ * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=node1&wn=node01&l=lb&wf=1&wa=2&wx=0
* <br/>
* <ul>
- * <li>wa=1 active</li>
- * <li>wa=2 disabled</li>
- * <li>wa=3 stopped</li>
+ * <li>wa=0 active</li>
+ * <li>wa=1 disabled</li>
+ * <li>wa=2 stopped</li>
* </ul>
* </li>
* </ul>
@@ -443,7 +443,7 @@
sb.append("&ws=");
sb.append(workerStopped);
}
- if (workerActivation > 0 && workerActivation < 4) {
+ if (workerActivation >= 0 && workerActivation < 3) {
sb.append("&wa=");
sb.append(workerActivation);
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=585465&r1=585464&r2=585465&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Oct 17 05:42:28 2007
@@ -81,6 +81,10 @@
possible confusion with custom header names using a standard header name
as a prefix. (rjung)
</fix>
+ <fix>
+ jkstatus: Fix correct parameter validation at JkStatusUpdateTask and
+ JkStatusUpdateLoadbalancerTask ant tasks. Reported by Christian Mittendorf. (pero)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org