You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/02 21:24:26 UTC
svn commit: r1814109 -
/commons/proper/daemon/trunk/src/native/unix/native/java.c
Author: markt
Date: Thu Nov 2 21:24:26 2017
New Revision: 1814109
URL: http://svn.apache.org/viewvc?rev=1814109&view=rev
Log:
Simplify based on minimum Java version of Java 6
Modified:
commons/proper/daemon/trunk/src/native/unix/native/java.c
Modified: commons/proper/daemon/trunk/src/native/unix/native/java.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/java.c?rev=1814109&r1=1814108&r2=1814109&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/java.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/java.c Thu Nov 2 21:24:26 2017
@@ -236,15 +236,9 @@ bool java_init(arg_data *args, home_data
/* Prepare the VM initialization arguments */
- /*
- * 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
+ /* Minimum Java version is Java 6 */
+ arg.version = JNI_VERSION_1_6;
+
#if defined(OSD_POSIX)
if (JNI_GetDefaultJavaVMInitArgs(&arg) < 0) {
log_error("Cannot init default JVM default args");