costin 02/03/25 19:04:24
Modified: jk/native2/common jk_worker_ajp13.c jk_worker_jni.c
Log:
Update to the new interface changes, few fixes.
Revision Changes Path
1.5 +8 -4 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_worker_ajp13.c 25 Mar 2002 03:34:38 -0000 1.4
+++ jk_worker_ajp13.c 26 Mar 2002 03:04:24 -0000 1.5
@@ -480,6 +480,7 @@
{
jk_endpoint_t *e = NULL;
jk_pool_t *endpointPool;
+ jk_bean_t *jkb;
if( ajp14->secret ==NULL ) {
}
@@ -496,9 +497,10 @@
}
}
- e = (jk_endpoint_t *)env->createInstance( env,ajp14->pool, "endpoint", NULL );
- if( e==NULL )
+ jkb=env->createBean2( env,ajp14->pool, "endpoint", NULL );
+ if( jkb==NULL )
return JK_FALSE;
+ e = (jk_endpoint_t *)jkb->object;
e->worker = ajp14;
*eP = e;
@@ -581,7 +583,9 @@
}
}
- ajp14->channel= env->getByName( env, ajp14->channelName );
+ if( ajp14->channel == NULL ) {
+ ajp14->channel= env->getByName( env, ajp14->channelName );
+ }
if( ajp14->channel == NULL ) {
jk_bean_t * chB=env->createBean( env, ajp14->workerEnv->pool,
ajp14->channelName);
@@ -677,6 +681,6 @@
w->workerEnv=env->getByName( env, "workerEnv" );
w->workerEnv->addWorker( env, w->workerEnv, w );
-
+
return JK_TRUE;
}
1.6 +11 -6 jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Index: jk_worker_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_worker_jni.c 18 Mar 2002 18:45:25 -0000 1.5
+++ jk_worker_jni.c 26 Mar 2002 03:04:24 -0000 1.6
@@ -169,6 +169,7 @@
jint rc = 0;
char *str_config = NULL;
jk_map_t *props=_this->workerEnv->initData;
+ jk_bean_t *chB;
if(! _this || ! _this->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
@@ -291,20 +292,21 @@
stdout_name,
stderr_name);
- jniWorker->vm->detach(env, jniWorker->vm);
+ jniWorker->vm->detach(env, jniWorker->vm);
+
_this->workerEnv->vm= jniWorker->vm;
/* We can have a single jni channel per instance, the name is
hardcoded */
- _this->channel=env->createInstance(env, _this->pool,"channel.jni",
- "channel.jni");
+ chB=env->createBean2(env, _this->pool,"channel.jni", "");
- if( _this->channel == NULL ) {
+ if( chB == NULL || chB->object==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"Error creating jni channel\n");
return JK_FALSE;
}
+ _this->channel=chB->object;
if(rc) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"jni.init() Tomcat initialized OK, done\n");
@@ -363,7 +365,8 @@
{
jk_worker_t *_this;
jni_worker_data_t *jniData;
-
+ jk_bean_t *jkb;
+
if(name==NULL) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"jni.factory() NullPointerException name==null\n");
@@ -388,7 +391,9 @@
_this->pool=pool;
/* XXX split it in VM11 and VM12 util */
- jniData->vm=env->createInstance( env, pool, "vm", "vm" );
+ jkb=env->createBean2( env, pool, "vm", "" );
+ if( jkb==NULL ) return JK_FALSE;
+ jniData->vm=jkb->object;
jniData->jk_java_bridge_class = NULL;
jniData->jk_startup_method = NULL;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
