You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/03/23 18:27:44 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
costin 02/03/23 09:27:44
Modified: jk/native2/common jk_worker_ajp13.c
Log:
Create the endpoint using the factory method
Revision Changes Path
1.2 +5 -24 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_worker_ajp13.c 20 Mar 2002 23:38:51 -0000 1.1
+++ jk_worker_ajp13.c 23 Mar 2002 17:27:44 -0000 1.2
@@ -501,31 +501,11 @@
}
}
- endpointPool = ajp14->pool->create( env, ajp14->pool, HUGE_POOL_SIZE );
-
- e = (jk_endpoint_t *)endpointPool->alloc(env, endpointPool,
- sizeof(jk_endpoint_t));
- if (e==NULL) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "ajp14.get_endpoint OutOfMemoryException\n");
+ e = (jk_env_t *)env->createInstance( env, "endpoint", NULL );
+ if( e==NULL )
return JK_FALSE;
- }
-
- e->pool = endpointPool;
-
- /* Init message storage areas.
- */
- e->request = jk2_msg_ajp_create( env, e->pool, 0);
- e->reply = jk2_msg_ajp_create( env, e->pool, 0);
- e->post = jk2_msg_ajp_create( env, e->pool, 0);
-
- e->reuse = JK_FALSE;
-
- e->cPool=endpointPool->create(env, endpointPool, HUGE_POOL_SIZE );
-
e->worker = ajp14;
- e->channelData = NULL;
-
+
*eP = e;
return JK_TRUE;
}
@@ -573,7 +553,8 @@
}
if( ajp14->channelName == NULL ) {
- /* Use default channel */
+
+
ajp14->channelName="channel.default";
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>