mturk 2002/10/02 05:48:26
Modified: jk/native2/common jk_worker_jni.c
Log:
We don't need the HAS_APR, cause we have HAVE_JNI.
Revision Changes Path
1.28 +4 -8 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_worker_jni.c 14 Jul 2002 13:33:56 -0000 1.27
+++ jk_worker_jni.c 2 Oct 2002 12:48:26 -0000 1.28
@@ -66,12 +66,10 @@
#include "jk_workerEnv.h"
#include "jk_env.h"
#include "jk_bean.h"
+
+#ifdef HAVE_JNI
-#ifdef HAS_APR
-#include "apr_thread_proc.h"
-#endif
-
-#ifdef HAVE_JNI
+#include "apr_thread_proc.h"
#include "jk_vm.h"
#include "jk_registry.h"
@@ -429,11 +427,9 @@
jniWorker->jk_main_method,
jargs);
if (jniWorker->hook == JK2_WORKER_HOOK_SHUTDOWN) {
-#ifdef HAS_APR
while (jk_jni_status_code != 2) {
apr_thread_yield();
}
-#endif
vm->detach(env, vm);
}
}
@@ -502,4 +498,4 @@
return JK_OK;
}
-#endif
+#endif
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
