costin 02/04/02 11:03:55
Modified: jk/native2/jni jk_channeljni_native.c jk_jni_aprImpl.c
jk/native2/common jk_workerEnv.c
Log:
Small fixes
Revision Changes Path
1.3 +2 -8 jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c
Index: jk_channeljni_native.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_channeljni_native.c 21 Feb 2002 11:17:17 -0000 1.2
+++ jk_channeljni_native.c 2 Apr 2002 19:03:54 -0000 1.3
@@ -55,16 +55,10 @@
* *
* ========================================================================= */
-/***************************************************************************
- * Description: JNI callbacks implementation for the JNI in process adapter*
- * Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
- ***************************************************************************/
-
-#include "jk_jnicb.h"
#include "jk_service.h"
#include "jk_pool.h"
#include "jk_env.h"
+#include "jni.h"
int jk2_channel_jni_javaSendPacket
@@ -73,7 +67,7 @@
/*
-
+ Wrapper for the real JNI channel method
*/
JNIEXPORT jint JNICALL
Java_org_apache_jk_common_ChannelJni_sendPacket
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_jni_aprImpl.c 21 Feb 2002 11:17:17 -0000 1.6
+++ jk_jni_aprImpl.c 2 Apr 2002 19:03:54 -0000 1.7
@@ -139,7 +139,7 @@
Java_org_apache_jk_apr_AprImpl_sendSignal(JNIEnv *jniEnv, jobject _jthis, jint
signo,
jlong target)
{
-
+
return 0;
}
1.23 +2 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_workerEnv.c 26 Mar 2002 03:03:43 -0000 1.22
+++ jk_workerEnv.c 2 Apr 2002 19:03:54 -0000 1.23
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.22 $ *
+ * Version: $Revision: 1.23 $ *
***************************************************************************/
#include "jk_env.h"
@@ -551,6 +551,7 @@
jkb=env->createBean2(env, wEnv->pool,"config", "");
env->alias(env, "config:", "config");
wEnv->config=jkb->object;
+ wEnv->config->file = NULL;
wEnv->config->workerEnv = wEnv;
wEnv->config->map = wEnv->initData;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
