costin 01/12/13 23:12:42 Modified: jk/native2/common jk_ajp14_worker.c jk_channel_socket.c jk_env.c jk_handler_discovery.c jk_handler_logon.c jk_handler_response.c jk_jni_worker.c jk_lb_worker.c jk_logger_file.c jk_uriMap.c jk_workerEnv.c Log: Use the new interface to maps. Revision Changes Path 1.9 +12 -5 jakarta-tomcat-connectors/jk/native2/common/jk_ajp14_worker.c Index: jk_ajp14_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_ajp14_worker.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_ajp14_worker.c 2001/12/13 18:49:01 1.8 +++ jk_ajp14_worker.c 2001/12/14 07:12:42 1.9 @@ -161,7 +161,8 @@ int proto=AJP14_PROTO; aw = _this; - secret_key = map_getStrProp( props, "worker", aw->name, "secretkey", NULL ); + secret_key = jk_map_getStrProp( we->env, props, + "worker", aw->name, "secretkey", NULL ); if ((!secret_key) || (!strlen(secret_key))) { proto=AJP13_PROTO; @@ -418,11 +419,17 @@ w= e->worker; + l->jkLog(l, JK_LOG_INFO, "ajp14.done() before reset pool %p\n", + e->cPool ); if( e->cPool != NULL ) e->cPool->reset(e->cPool); + l->jkLog(l, JK_LOG_INFO, "ajp14.done() after reset pool %p\n", + e->cPool ); if (w->endpointCache != NULL ) { int err=0; + l->jkLog(l, JK_LOG_INFO, "ajp14.done() before return to pool %s\n", + w->name ); err=w->endpointCache->put( w->endpointCache, e ); if( err==JK_TRUE ) { @@ -507,8 +514,8 @@ int proto=AJP14_PROTO; int cache_sz; - secret_key = map_getStrProp( props, "worker", _this->name, - "secretkey", NULL ); + secret_key = jk_map_getStrProp( we->env, props, + "worker", _this->name, "secretkey", NULL ); if( secret_key==NULL ) { proto=AJP13_PROTO; @@ -521,9 +528,9 @@ /* start the connection cache */ - cache_sz = map_getIntProp( props, "worker", _this->name, "cachesize", + cache_sz=jk_map_getIntProp(we->env, props, + "worker", _this->name, "cachesize", JK_OBJCACHE_DEFAULT_SZ ); - if (cache_sz > 0) { int err; _this->endpointCache=jk_objCache_create( _this->pool, l ); 1.9 +9 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c Index: jk_channel_socket.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_channel_socket.c 2001/12/13 18:49:01 1.8 +++ jk_channel_socket.c 2001/12/14 07:12:42 1.9 @@ -156,9 +156,15 @@ char *host=socketInfo->host; short port=socketInfo->port; struct sockaddr_in *rc=&socketInfo->addr; - - port = map_getIntProp( props, "worker", worker_name, "port", port ); - host = map_getStrProp( props, "worker", worker_name, "host", host); + jk_workerEnv_t *workerEnv=worker->workerEnv; + char *tmp; + + host = jk_map_getStrProp( NULL, props, + "worker", worker_name, "host", host); + tmp = jk_map_getStrProp( NULL, props, + "worker", worker_name, "port", NULL ); + if( tmp != NULL ) + port=jk_map_str2int( NULL, tmp); _this->worker=worker; _this->properties=props; 1.6 +4 -3 jakarta-tomcat-connectors/jk/native2/common/jk_env.c Index: jk_env.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_env.c 2001/12/12 23:36:01 1.5 +++ jk_env.c 2001/12/14 07:12:42 1.6 @@ -101,7 +101,8 @@ } /** XXX add check for the type */ - result=(jk_env_objectFactory_t)map_get( env->_registry, typeName, NULL ); + result=(jk_env_objectFactory_t)env->_registry->get( env, env->_registry, + typeName); free( typeName ); return result; } @@ -146,7 +147,7 @@ strcpy(typeName, type ); strcat( typeName, "/" ); strcat( typeName, name ); - map_put( env->_registry, typeName, fact, &old ); + env->_registry->put( env, env->_registry, typeName, fact, &old ); } static void jk_env_initEnv( jk_env_t *env, char *id ) { @@ -155,7 +156,7 @@ env->getFactory= jk_env_getFactory; env->registerFactory= jk_env_registerFactory; env->getInstance= jk_env_getInstance; - map_alloc( & env->_registry, env->globalPool ); + jk_map_default_create( env, & env->_registry, env->globalPool ); jk_registry_init(env); } 1.9 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c Index: jk_handler_discovery.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_handler_discovery.c 2001/12/13 18:49:01 1.8 +++ jk_handler_discovery.c 2001/12/14 07:12:42 1.9 @@ -58,7 +58,7 @@ /** * Description: AJP14 Discovery handler * Author: Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.8 $ + * Version: $Revision: 1.9 $ */ #include "jk_global.h" @@ -244,20 +244,20 @@ jk_map_t *map; jk_handler_t *h; - map_alloc( &map, pool ); + jk_map_default_create( env, &map, pool ); *result=map; h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="contextInfo"; h->messageId=AJP14_CONTEXT_INFO_CMD; h->callback=jk_handler_contextList; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="contextState"; h->messageId=AJP14_CONTEXT_STATE_REP_CMD; h->callback=jk_handler_contextState; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); return JK_TRUE; } 1.9 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c Index: jk_handler_logon.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_handler_logon.c 2001/12/13 19:06:36 1.8 +++ jk_handler_logon.c 2001/12/14 07:12:42 1.9 @@ -58,7 +58,7 @@ /** * Description: AJP14 Login handler * Author: Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.8 $ + * Version: $Revision: 1.9 $ */ #include "jk_global.h" @@ -259,26 +259,26 @@ jk_map_t *map; jk_handler_t *h; - map_alloc( &map, pool ); + jk_map_default_create( env, &map, pool ); *result=map; h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="login"; h->messageId=AJP14_LOGSEED_CMD; h->callback=jk_handler_login; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="logOk"; h->messageId=AJP14_LOGOK_CMD; h->callback=jk_handler_logok; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="logNok"; h->messageId=AJP14_LOGNOK_CMD; h->callback=jk_handler_lognok; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); return JK_TRUE; } 1.8 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c Index: jk_handler_response.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_handler_response.c 2001/12/13 18:49:01 1.7 +++ jk_handler_response.c 2001/12/14 07:12:42 1.8 @@ -276,32 +276,32 @@ jk_map_t *map; jk_handler_t *h; - map_alloc( &map, pool ); + jk_map_default_create( env, &map, pool ); *result=map; h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="sendHeaders"; h->messageId=JK_AJP13_SEND_HEADERS; h->callback=jk_handler_startResponse; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="sendChunk"; h->messageId=JK_AJP13_SEND_BODY_CHUNK; h->callback=jk_handler_sendChunk; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="endResponse"; h->messageId=JK_AJP13_END_RESPONSE; h->callback=jk_handler_endResponse; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); h=(jk_handler_t *)pool->calloc( pool, sizeof( jk_handler_t)); h->name="getChunk"; h->messageId=JK_AJP13_GET_BODY_CHUNK; h->callback=jk_handler_getChunk; - map_put( map, h->name, h, NULL ); + map->put( env, map, h->name, h, NULL ); return JK_TRUE; } 1.9 +21 -12 jakarta-tomcat-connectors/jk/native2/common/jk_jni_worker.c Index: jk_jni_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_jni_worker.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_jni_worker.c 2001/12/12 23:36:01 1.8 +++ jk_jni_worker.c 2001/12/14 07:12:42 1.9 @@ -59,7 +59,7 @@ * Description: In process JNI worker * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Based on: * - * Version: $Revision: 1.8 $ * + * Version: $Revision: 1.9 $ * ***************************************************************************/ #if !defined(WIN32) && !defined(NETWARE) @@ -450,17 +450,18 @@ return JK_TRUE; } - mem_config= map_getIntProp( props, "worker", p->name, "mx", -1 ); + mem_config= jk_map_getIntProp( NULL, props, "worker", p->name, "mx", -1 ); if( mem_config != -1 ) { p->tomcat_mx = mem_config; } - mem_config= map_getIntProp( props, "worker", p->name, "ms", -1 ); + mem_config= jk_map_getIntProp( NULL, props, "worker", p->name, "ms", -1 ); if(mem_config != -1 ) { p->tomcat_ms = mem_config; } - str_config= map_getStrProp( props, "worker", p->name, "class_path", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, + "class_path", NULL ); if(str_config != NULL ) { p->tomcat_classpath = p->pool->pstrdup(p->pool, str_config); } @@ -470,7 +471,8 @@ return JK_FALSE; } - str_config= map_getStrProp( props, "worker", p->name, "jvm_lib", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, "jvm_lib", + NULL ); if(str_config != NULL ) { p->jvm_dll_path = p->pool->pstrdup(p->pool, str_config); } @@ -480,39 +482,46 @@ return JK_FALSE; } - str_config= map_getStrProp( props, "worker", p->name, "cmd_line", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, + "cmd_line", NULL ); if(str_config != NULL ) { p->tomcat_cmd_line = p->pool->pstrdup(p->pool, str_config); } - str_config= map_getStrProp( props, "worker", p->name, "stdout", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, "stdout", + NULL ); if(str_config!= NULL ) { p->stdout_name = p->pool->pstrdup(p->pool, str_config); } - str_config= map_getStrProp( props, "worker", p->name, "stderr", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, "stderr", + NULL ); if(str_config!= NULL ) { p->stderr_name = p->pool->pstrdup(p->pool, str_config); } - str_config= map_getStrProp( props, "worker", p->name, "sysprops", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, + "sysprops", NULL ); if(str_config!= NULL ) { p->sysprops = jk_parse_sysprops(p->pool, str_config); } #ifdef JNI_VERSION_1_2 - str_config= map_getStrProp( props, "worker", p->name, "java2opts", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, "java2opts", + NULL ); if( str_config != NULL ) { /* l->jkLog(l, JK_LOG_DEBUG, "Got opts: %s\n", str_config); */ p->java2opts = jk_parse_sysprops(p->pool, str_config); } - mem_config= map_getIntProp( props, "worker", p->name, "java2lax", -1 ); + mem_config= jk_map_getIntProp( NULL, props, "worker", p->name, + "java2lax", -1 ); if(mem_config != -1 ) { p->java2lax = mem_config ? JK_TRUE : JK_FALSE; } #endif - str_config= map_getStrProp( props, "worker", p->name, "ld_path", NULL ); + str_config= jk_map_getStrProp( NULL, props, "worker", p->name, + "ld_path", NULL ); if(str_config!= NULL ) { jk_append_libpath(p->pool, str_config); } 1.9 +20 -9 jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c Index: jk_lb_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_lb_worker.c 2001/12/13 18:49:01 1.8 +++ jk_lb_worker.c 2001/12/14 07:12:42 1.9 @@ -60,7 +60,7 @@ * several workers. * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Based on: * - * Version: $Revision: 1.8 $ * + * Version: $Revision: 1.9 $ * ***************************************************************************/ #include "jk_pool.h" @@ -292,14 +292,23 @@ char **worker_names; unsigned num_of_workers; unsigned i = 0; + char *tmp; if(! _this ) { l->jkLog(l, JK_LOG_ERROR,"lb_worker.validate(): NullPointerException\n"); return JK_FALSE; } - worker_names=map_getListProp( props, "worker", _this->name, - "balanced_workers", &num_of_workers ); + tmp=jk_map_getStrProp( NULL, props, "worker", _this->name, + "balanced_workers", NULL ); + if( tmp==NULL ) { + l->jkLog(l, JK_LOG_ERROR,"lb_worker.validate(): no defined workers\n"); + return JK_FALSE; + } + + worker_names=jk_map_split( NULL, props, props->pool, + tmp, &num_of_workers ); + if( worker_names==NULL || num_of_workers==0 ) { l->jkLog(l, JK_LOG_ERROR,"lb_worker.validate(): no defined workers\n"); return JK_FALSE; @@ -327,10 +336,12 @@ /* Ignore, we may have other workers */ continue; } - - _this->lb_workers[i]->lb_factor = - map_getDoubleProp( props, "worker", name, "lbfactor", - DEFAULT_LB_FACTOR); + + tmp=jk_map_getStrProp( NULL, props, "worker", name, "lbfactor", NULL ); + if( tmp==NULL ) + _this->lb_workers[i]->lb_factor = DEFAULT_LB_FACTOR; + else + _this->lb_workers[i]->lb_factor = atof( tmp ); _this->lb_workers[i]->lb_factor = 1/ _this->lb_workers[i]->lb_factor; @@ -358,8 +369,8 @@ jk_logger_t *log) { /* start the connection cache */ - int cache_sz = map_getIntProp( props, "worker", _this->name, "cachesize", - JK_OBJCACHE_DEFAULT_SZ ); + int cache_sz = jk_map_getIntProp( NULL, props, "worker", _this->name, "cachesize", + JK_OBJCACHE_DEFAULT_SZ ); if (cache_sz > 0) { int err; 1.8 +6 -6 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c Index: jk_logger_file.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_logger_file.c 2001/12/13 18:49:01 1.7 +++ jk_logger_file.c 2001/12/14 07:12:42 1.8 @@ -59,7 +59,7 @@ * Description: Utility functions (mainly configuration) * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.7 $ * + * Version: $Revision: 1.8 $ * ***************************************************************************/ #include "jk_env.h" @@ -148,12 +148,12 @@ static int jk_logger_file_open(jk_logger_t *_this, jk_map_t *properties ) { - char *file=map_getStrProp(properties,"logger","file", - "name","mod_jk.log"); + char *file=jk_map_getStrProp(NULL, properties,"logger","file", + "name","mod_jk.log"); int level; - char *levelS=map_getStrProp(properties,"logger","file", - "level", "ERROR"); - char *logformat=map_getStrProp(properties,"logger","file", + char *levelS=jk_map_getStrProp(NULL, properties,"logger","file", + "level", "ERROR"); + char *logformat=jk_map_getStrProp(NULL, properties,"logger","file", "timeFormat", JK_TIME_FORMAT); FILE *f; 1.11 +7 -6 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c Index: jk_uriMap.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_uriMap.c 2001/12/13 18:49:01 1.10 +++ jk_uriMap.c 2001/12/14 07:12:42 1.11 @@ -67,7 +67,7 @@ * servlet container. * * Author: Gal Shachor <[EMAIL PROTECTED]> - * Version: $Revision: 1.10 $ + * Version: $Revision: 1.11 $ */ #include "jk_pool.h" @@ -326,18 +326,19 @@ _this->workerEnv = workerEnv; - sz = map_size(init_data); + sz = init_data->size(NULL, init_data); - _this->debug=map_getIntProp(init_data,"urimap", "default", "debug", 0 ); + _this->debug=jk_map_getIntProp(NULL, + init_data,"urimap", "default", "debug", 0 ); for(i = 0; i < sz ; i++) { - char *name=map_name_at(init_data, i); + char *name=init_data->nameAt(NULL, init_data, i); if( name!=NULL && name[0]=='/' ) { jk_uriEnv_t *uriEnv=_this->addMapping(_this,NULL,name, - map_value_at(init_data, i)); + init_data->valueAt(NULL, init_data, i)); if ( uriEnv==NULL) { l->jkLog(l, JK_LOG_ERROR, "uriMap.init() error adding %s\n", - map_name_at(init_data, i)); + init_data->nameAt(NULL, init_data, i)); rc=JK_FALSE; } } 1.9 +21 -26 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c Index: jk_workerEnv.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_workerEnv.c 2001/12/13 18:49:01 1.8 +++ jk_workerEnv.c 2001/12/14 07:12:42 1.9 @@ -59,7 +59,7 @@ * Description: Workers controller * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.8 $ * + * Version: $Revision: 1.9 $ * ***************************************************************************/ #include "jk_workerEnv.h" @@ -86,15 +86,16 @@ jk_logger_t *l=_this->l; int i; int err; + char *tmp; /* _this->init_data=init_data; */ - worker_list = map_get_string_list(init_data, - NULL, - "worker.list", - &_this->num_of_workers, - DEFAULT_WORKER ); - if(worker_list==NULL || _this->num_of_workers<= 0 ) { + tmp = jk_map_getString(NULL, init_data, "worker.list", + DEFAULT_WORKER ); + worker_list=jk_map_split( NULL, init_data, init_data->pool, + tmp, &_this->num_of_workers ); + + if(worker_list==NULL || _this->num_of_workers<= 0 ) { /* assert() - we pass default worker, we should get something back */ return JK_FALSE; } @@ -132,23 +133,19 @@ int sz; int i; - sz = map_size(_this->worker_map); + sz = _this->worker_map->size(NULL, _this->worker_map); - if(sz <= 0) { - map_free(&_this->worker_map); - return; - } for(i = 0 ; i < sz ; i++) { - jk_worker_t *w = map_value_at(_this->worker_map, i); + jk_worker_t *w = _this->worker_map->valueAt(NULL, _this->worker_map, i); if(w) { l->jkLog(l, JK_LOG_DEBUG, "destroy worker %s\n", - map_name_at(_this->worker_map, i)); + _this->worker_map->nameAt(NULL, _this->worker_map, i)); w->destroy(&w, l); } } l->jkLog(_this->l, JK_LOG_DEBUG, "workerEnv.close() done %d\n", sz); - map_free(&_this->worker_map); + _this->worker_map->clear(NULL, _this->worker_map); } static jk_worker_t *jk_workerEnv_getWorkerForName(jk_workerEnv_t *_this, @@ -163,7 +160,7 @@ return NULL; } - rc = map_get(_this->worker_map, name, NULL); + rc = _this->worker_map->get(NULL, _this->worker_map, name); /* if( rc==NULL ) { */ /* l->jkLog(l, JK_LOG_INFO, */ @@ -229,7 +226,7 @@ /* Find the max message id */ /* XXX accessing private data... env most provide some method to get this */ jk_map_t *registry=_this->env->_registry; - int size=map_size( registry ); + int size=registry->size( NULL, registry ); int i,j; for( i=0; i<size; i++ ) { @@ -237,7 +234,7 @@ jk_map_t *localHandlers; int rc; - char *name=map_name_at( registry, i ); + char *name= registry->nameAt( NULL, registry, i ); if( strstr( name, "handler" ) == name ) { char *type=name+ strlen( "handler" ) +1; localHandlers=(jk_map_t *)_this->env->getInstance(_this->env, @@ -246,8 +243,8 @@ type ); if( localHandlers==NULL ) continue; - for( j=0; j< map_size( localHandlers ); j++ ) { - handler=(jk_handler_t *)map_value_at( localHandlers, j ); + for( j=0; j< localHandlers->size( NULL, localHandlers ); j++ ) { + handler=(jk_handler_t *)localHandlers->valueAt( NULL, localHandlers, j ); jk_workerEnv_checkSpace( _this->pool, (void ***)&_this->handlerTable, &_this->lastMessageId, @@ -397,7 +394,7 @@ workerPool=_this->pool->create(_this->pool, HUGE_POOL_SIZE); - type=map_getStrProp( init_data,"worker",name,"type",NULL ); + type=jk_map_getStrProp( NULL, init_data,"worker",name,"type",NULL ); /* Each worker has it's own pool */ @@ -438,7 +435,7 @@ l->jkLog(l, JK_LOG_INFO, "workerEnv.createWorker(): validate and init %s:%s\n", type, name); - map_put(_this->worker_map, name, w, (void *)&oldW); + _this->worker_map->put(NULL, _this->worker_map, name, w, (void *)&oldW); if(oldW!=NULL) { l->jkLog(_this->l, JK_LOG_ERROR, "workerEnv.createWorker() duplicated %s worker \n", @@ -464,7 +461,7 @@ *result=_this; _this->init_data = NULL; - map_alloc(& _this->init_data, pool); + jk_map_default_create(env, & _this->init_data, pool); _this->worker_file = NULL; @@ -512,14 +509,12 @@ _this->secret_key = NULL; _this->envvars_in_use = JK_FALSE; - map_alloc(&_this->envvars, pool); + jk_map_default_create(NULL, &_this->envvars, pool); _this->l=l; _this->env=env; - if(!map_alloc(&_this->worker_map, _this->pool)) { - return JK_FALSE; - } + jk_map_default_create(NULL,&_this->worker_map, _this->pool); uriMapPool = _this->pool->create(_this->pool, HUGE_POOL_SIZE);
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>