Author: jfclere
Date: Tue Apr 19 00:41:23 2005
New Revision: 161852
URL: http://svn.apache.org/viewcvs?view=rev&rev=161852
Log:
Fix 31613:
Use JVM 1.4 when available (otherwise 1.3 will be used...)
Modified:
jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c?view=diff&r1=161851&r2=161852
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c Tue Apr
19 00:41:23 2005
@@ -163,7 +163,16 @@
log_debug("JVM library entry point found (0x%08X)",symb);
/* Prepare the VM initialization arguments */
- arg.version=JNI_VERSION_1_2;
+
+ /*
+ Mac OS X Java will load JVM 1.3.1 instead of 1.4.2 if JNI_VERSION_1_2
+ is specified. So use JNI_VERSION_1_4 if we can.
+ */
+ #if defined(JNI_VERSION_1_4)
+ arg.version=JNI_VERSION_1_4;
+ #else
+ arg.version=JNI_VERSION_1_2;
+ #endif
arg.ignoreUnrecognized=FALSE;
arg.nOptions=args->onum;
arg.nOptions++; /* Add abort code */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
