nacho 2002/06/10 14:49:53
Modified: jk/native2/jni jk_jni_aprImpl.c
Log:
* Changed %p format specifiers to %#lx - Thanks to JFC
* Only relase array if arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS
Revision Changes Path
1.34 +19 -16 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_jni_aprImpl.c 10 Jun 2002 21:36:15 -0000 1.33
+++ jk_jni_aprImpl.c 10 Jun 2002 21:49:53 -0000 1.34
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -215,7 +215,7 @@
if( jniChannel==NULL ) {
jniChannel=env->getByName( env, "channel.jni:jni" );
- fprintf(stderr, "Got jniChannel %p\n", jniChannel );
+ fprintf(stderr, "Got jniChannel %#lx\n", jniChannel );
}
if( jniChannel==NULL ) {
return;
@@ -227,7 +227,7 @@
return;
}
component->init( env, component );
- fprintf(stderr, "Create endpoint %p\n", component->object );
+ fprintf(stderr, "Create endpoint %#lx\n", component->object );
signalEndpoint=component->object;
}
@@ -341,11 +341,11 @@
if( jk_env_globalEnv == NULL )
return 0;
- /* fprintf(stderr, "Get env %p\n", jk_env_globalEnv); */
+ /* fprintf(stderr, "Get env %#lx\n", jk_env_globalEnv); */
env=jk_env_globalEnv->getEnv( jk_env_globalEnv );
/* if( env!=NULL) */
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
- /* "aprImpl.getJkEnv() %p\n", env); */
+ /* "aprImpl.getJkEnv() %#lx\n", env); */
return (jlong)(long)(void *)env;
}
@@ -364,7 +364,7 @@
if( jniDebug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "aprImpl.releaseJkEnv() %p\n", env);
+ "aprImpl.releaseJkEnv() %#lx\n", env);
}
/*
@@ -388,7 +388,7 @@
env->recycleEnv( env );
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
- /* "aprImpl.releaseJkEnv() %p\n", env); */
+ /* "aprImpl.releaseJkEnv() %#lx\n", env); */
}
@@ -407,7 +407,7 @@
component=env->getBean( env, cname );
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
- /* "aprImpl.getJkHandler() %p %s\n", component, cname ); */
+ /* "aprImpl.getJkHandler() %#lx %s\n", component, cname ); */
(*jniEnv)->ReleaseStringUTFChars(jniEnv, compNameJ, cname);
@@ -534,7 +534,7 @@
jk_bean_t *bean=(jk_bean_t *)target;
jk_endpoint_t *ep;
- jbyte *nbuf;
+ jbyte *nbuf=NULL;
jboolean iscopy;
int cnt=0;
@@ -553,7 +553,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,"jni.jkInvoke() NPE ep==null\n");
return JK_ERR;
}
-
+
if( arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS ) {
nbuf = (*jniEnv)->GetByteArrayElements(jniEnv, data, &iscopy);
if( iscopy )
@@ -568,7 +568,6 @@
if( raw==0 ) {
ep->reply->reset(env, ep->reply);
}
-
oldBuf=ep->reply->buf;
ep->reply->buf = (unsigned char *)nbuf;
} else if ( arrayAccessMethod == JK_GET_REGION ) {
@@ -588,16 +587,20 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"jkInvoke() invalid data\n");
/* we just can't recover, unset recover flag */
- (*jniEnv)->ReleaseByteArrayElements(jniEnv, data, nbuf, 0);
- ep->reply->buf=oldBuf;
+ if( arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS ) {
+ (*jniEnv)->ReleaseByteArrayElements(jniEnv, data, ep->reply->buf, 0);
+ ep->reply->buf=oldBuf;
+ }
return JK_ERR;
}
if( bean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jkInvoke() component dispatch %d %d %p\n", rc, code,
bean->invoke);
+ "jkInvoke() component dispatch %d %d \n", rc, code );
if( bean->invoke != NULL ) {
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "jkInvoke() invoke %#lx \n", bean->invoke );
rc=bean->invoke( env, bean, ep, code, ep->reply, raw );
} else {
/* Backward compat for AJP13 messages, where the code is used to
@@ -618,7 +621,7 @@
} else if ( arrayAccessMethod == JK_GET_REGION ) {
if( rc == JK_INVOKE_WITH_RESPONSE ) {
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
- /* "jkInvoke() release %d %d %p\n", */
+ /* "jkInvoke() release %d %d %#lx\n", */
/* ep->reply->pos, ep->reply->len , ep->reply->buf ); */
(*jniEnv)->SetByteArrayRegion( jniEnv, data, 0, ep->reply->len + 4 ,
(jbyte *)ep->reply->buf );
rc=JK_OK;
@@ -627,7 +630,7 @@
if( (*jniEnv)->ExceptionCheck( jniEnv ) ) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jkInvoke() component dispatch %d %d %p\n", rc, code,
bean->invoke);
+ "jkInvoke() component dispatch %d %d %#lx\n", rc, code,
bean->invoke);
(*jniEnv)->ExceptionDescribe( jniEnv );
/* Not needed if Describe is used.
(*jniEnv)->ExceptionClear( jniEnv ) */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
