Author: rjung
Date: Tue Mar 10 01:41:22 2009
New Revision: 751942
URL: http://svn.apache.org/viewvc?rev=751942&view=rev
Log:
Fix crash in text display of status worker.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=751942&r1=751941&r2=751942&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Tue Mar 10 01:41:22
2009
@@ -1544,9 +1544,9 @@
jk_printf(s, " source=\"%s\"", uri_worker_map_get_source(uwr, l));
jk_printf(s, " reply_timeout=\"%d\"",
uwr->extensions.reply_timeout);
jk_printf(s, " fail_on_status=\"%s\"",
uwr->extensions.fail_on_status_str ? uwr->extensions.fail_on_status_str : "");
- jk_printf(s, " active=\"%s\"", uwr->extensions.active);
- jk_printf(s, " disabled=\"%s\"", uwr->extensions.disabled);
- jk_printf(s, " stopped=\"%s\"", uwr->extensions.stopped);
+ jk_printf(s, " active=\"%s\"", uwr->extensions.active ?
uwr->extensions.active : "-");
+ jk_printf(s, " disabled=\"%s\"", uwr->extensions.disabled ?
uwr->extensions.disabled : "-");
+ jk_printf(s, " stopped=\"%s\"", uwr->extensions.stopped ?
uwr->extensions.stopped : "-");
jk_puts(s, "\n");
}
else if (mime == JK_STATUS_MIME_PROP) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=751942&r1=751941&r2=751942&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Mar 10
01:41:22 2009
@@ -43,6 +43,9 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ Status: Fix crash in text display of status worker. (rjung)
+ </fix>
<update>
LB: Add new property error_escalation_time to fine tune
escalation of local errors to global errors. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
