cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config.c

[costin]

costin      02/05/03 10:40:25

  Modified:    jk/native2/common jk_config.c
  Log:
  Display an error message on unknown property names.
  
  debugEnv will turn on the messages about object creation/etc.
  
  Revision  Changes    Path
  1.13      +18 -3     jakarta-tomcat-connectors/jk/native2/common/jk_config.c
  
  Index: jk_config.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_config.c       25 Apr 2002 18:49:37 -0000      1.12
  +++ jk_config.c       3 May 2002 17:40:25 -0000       1.13
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: General purpose config object                                 *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
  - * Version:     $Revision: 1.12 $                                           *
  + * Version:     $Revision: 1.13 $                                           *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -278,8 +278,14 @@
           return JK_OK;
       }
       
  -    if(mbean->setAttribute)
  -        return mbean->setAttribute( env, mbean, name, val );
  +    if(mbean->setAttribute) {
  +        int rc= mbean->setAttribute( env, mbean, name, val );
  +        if( rc != JK_OK ) {
  +            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                          "config.setAttribute() Error setting %s %s %s\n", 
mbean->name, name, val );
  +        }
  +        return rc;
  +    }
       return JK_ERR;
   }
   
  @@ -302,7 +308,14 @@
           cfg->setProperty( env, cfg, cfg->mbean, name, value );
           return status;
       }
  +
  +    if( strncmp( objName, "disabled:", 9) == 0 ) {
  +        return JK_OK;
  +    }
       
  +    /** Replace properties in the object name */
  +    objName = jk2_config_replaceProperties(env, cfg->map, cfg->map->pool, objName);
  +
       mbean=env->getBean( env, objName );
       if( mbean==NULL ) {
           mbean=env->createBean( env, cfg->pool, objName );
  @@ -779,6 +792,8 @@
       
       if( strcmp( name, "file" )==0 ) {
           return jk2_config_setConfigFile(env, cfg, cfg->workerEnv, value);
  +    } else if( strcmp( name, "debugEnv" )==0 ) {
  +        env->debug=atoi( value );
       } else if( strcmp( name, "save" )==0 ) {
           /* Experimental. Setting save='foo' will save the current config in
              foo
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>