Author: mturk
Date: Wed Jan 31 00:30:50 2007
New Revision: 501764
URL: http://svn.apache.org/viewvc?view=rev&rev=501764
Log:
Add empty worker factory for jni worker in case Java6 is detected.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c?view=diff&rev=501764&r1=501763&r2=501764
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c Wed Jan 31
00:30:50 2007
@@ -28,12 +28,11 @@
#include <jni.h>
-#if !defined(JNI_VERSION_1_6)
-
#include "jk_pool.h"
#include "jk_jni_worker.h"
#include "jk_util.h"
+#if !defined(JNI_VERSION_1_6)
#if defined LINUX && defined APACHE2_SIGHACK
#include <pthread.h>
#include <signal.h>
@@ -1237,5 +1236,13 @@
"cannot detach from JVM.");
}
JK_TRACE_EXIT(l);
+}
+#else
+int JK_METHOD jni_worker_factory(jk_worker_t **w,
+ const char *name, jk_logger_t *l)
+{
+ if (w)
+ *w = NULL;
+ return 0;
}
#endif /* JNI_VERSION_1_6 */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
