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/04/30 08:49:45 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c jk_env.c
costin 02/04/29 23:49:45
Modified: jk/native2/common jk_channel_apr_socket.c jk_env.c
Log:
Other minor fixes.
Revision Changes Path
1.10 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_channel_apr_socket.c 25 Apr 2002 18:46:38 -0000 1.9
+++ jk_channel_apr_socket.c 30 Apr 2002 06:49:45 -0000 1.10
@@ -365,7 +365,7 @@
jk_endpoint_t *endpoint)
{
apr_socket_t *sd;
- apr_status_t *rc;
+ apr_status_t rc;
jk_channel_apr_data_t *chD=endpoint->channelData;
if( chD==NULL )
1.20 +8 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_env.c 25 Apr 2002 19:12:57 -0000 1.19
+++ jk_env.c 30 Apr 2002 06:49:45 -0000 1.20
@@ -167,10 +167,15 @@
char *type, char *localName )
{
jk_env_objectFactory_t fac;
- jk_bean_t *result;
+ jk_bean_t *result=NULL;
jk_pool_t *workerPool;
char *name;
+ if( localName!=NULL )
+ result=env->getBean2( env, type, localName );
+ if( result!=NULL )
+ return result;
+
if( pool==NULL ) {
pool=env->globalPool;
}
@@ -307,7 +312,7 @@
{
if( name==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "env.getByName(): NullPointerException\n");
+ "env.getBean(): NullPointerException\n");
return NULL;
}
@@ -319,7 +324,7 @@
char *name;
if( type==NULL || localName==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "env.getByName(): NullPointerException\n");
+ "env.getBean2(): NullPointerException\n");
return NULL;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>