mturk 2002/11/06 23:27:18
Modified: jk/native2/common jk_vm_default.c
Log:
Rename the error hook to the exit (that's it real pupose after all).
Revision Changes Path
1.28 +9 -7 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_vm_default.c 6 Nov 2002 16:32:25 -0000 1.27
+++ jk_vm_default.c 7 Nov 2002 07:27:18 -0000 1.28
@@ -185,23 +185,25 @@
#endif
/* JVM hooks */
-static int jk2_jni_error_signaled = JK_FALSE;
-static int jk2_jni_error_code = 0;
+static int jk2_jni_exit_signaled = JK_FALSE;
+static int jk2_jni_exit_code = 0;
static int jk2_jni_abort_signaled = JK_FALSE;
-static void jk2_jni_error_hook(int code)
+static void jk2_jni_exit_hook(int code)
{
- jk2_jni_error_signaled = JK_TRUE;
- jk2_jni_error_code = code;
+ jk2_jni_exit_signaled = JK_TRUE;
+ jk2_jni_abort_signaled = JK_TRUE;
+ jk2_jni_exit_code = code;
#ifdef DEBUG
- fprintf(stderr, "JVM error hook called %d\n", code);
+ fprintf(stderr, "JVM exit hook called %d\n", code);
#endif
}
static void jk2_jni_abort_hook()
{
jk2_jni_abort_signaled = JK_TRUE;
+
#ifdef DEBUG
fprintf(stderr, "JVM abort hook\n");
#endif
@@ -567,7 +569,7 @@
/* Set the abort and exit hooks */
options[optn].optionString = "exit";
- options[optn++].extraInfo = jk2_jni_error_hook;
+ options[optn++].extraInfo = jk2_jni_exit_hook;
options[optn].optionString = "abort";
options[optn++].extraInfo = jk2_jni_abort_hook;
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
