costin 02/03/25 19:04:10
Modified: jk/native2/common jk_worker_status.c
Log:
Cleaner and more accurate display of configured and processed properties.
Revision Changes Path
1.12 +18 -10 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_worker_status.c 24 Mar 2002 19:24:26 -0000 1.11
+++ jk_worker_status.c 26 Mar 2002 03:04:10 -0000 1.12
@@ -163,22 +163,30 @@
char *name=env->_objects->nameAt( env, env->_objects, i );
jk_bean_t *mbean=env->_objects->valueAt( env, env->_objects, i );
int j;
+ int propCount;
+
+ /* Don't display aliases */
+ if( strchr(name, ':')==NULL )
+ continue;
if( mbean==NULL || mbean->settings==NULL )
continue;
- s->jkprintf(env, s, "<tr><td>%s</td>", mbean->name );
-
- for( j=0; j < mbean->settings->size( env, mbean->settings ); j++ ) {
- char *pname=mbean->settings->nameAt( env, mbean->settings, j);
- /* Don't save redundant information */
- if( strcmp( pname, "name" ) != NULL ) {
- s->jkprintf( env, s, "<td>%s</td><td>%s</td>\n",
- pname,
- mbean->settings->valueAt( env, mbean->settings, j));
+ propCount=mbean->settings->size( env, mbean->settings );
+
+ if( propCount==0 ) {
+ s->jkprintf(env, s, "<tr><td>%s</td></tr>", mbean->name );
+ } else {
+ for( j=0; j < propCount ; j++ ) {
+ char *pname=mbean->settings->nameAt( env, mbean->settings, j);
+ /* Don't save redundant information */
+ if( strcmp( pname, "name" ) != 0 ) {
+ s->jkprintf(env, s,
"<tr><td>%s</td><td>%s</td><td>%s</td></tr>",
+ name, pname,
+ mbean->settings->valueAt( env, mbean->settings, j));
+ }
}
}
- s->jkprintf( env,s , "</tr>\n" );
}
s->jkprintf( env,s , "</table>\n" );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
