From df8d471cfb4b05c7a01c30a8b8be7e9fb3f6af9f Mon Sep 17 00:00:00 2001 From: Andrei Vasiliu Date: Mon, 29 Feb 2016 15:54:53 +0200 Subject: [PATCH] java: Changed JNI version to 1.6 This change is needed to compile/run with OpenJDK 7, as well as with OpenJDK 8. Signed-off-by: Andrei Vasiliu Signed-off-by: Brendan Le Foll --- src/gpio/gpio.c | 4 ++-- src/java/mraajava.i | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c index 8f387de..3b41612 100644 --- a/src/gpio/gpio.c +++ b/src/gpio/gpio.c @@ -246,7 +246,7 @@ static void make_env_key(void) { JNIEnv *jenv; - (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_8); + (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_6); jclass rcls = (*jenv)->FindClass(jenv, "java/lang/Runnable"); jmethodID runm = (*jenv)->GetMethodID(jenv, rcls, "run", "()V"); @@ -481,7 +481,7 @@ mraa_gpio_isr(mraa_gpio_context dev, mraa_gpio_edge_t mode, void (*fptr)(void*), /* Most UPM sensors use the C API, the global ref must be created here. */ /* The reason for checking the callback function is internal callbacks. */ if (fptr == mraa_java_isr_callback) { - (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_8); + (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_6); jobject grunnable = (*jenv)->NewGlobalRef(jenv, (jobject) args); args = (void *) grunnable; } diff --git a/src/java/mraajava.i b/src/java/mraajava.i index d8b698b..9dc7142 100644 --- a/src/java/mraajava.i +++ b/src/java/mraajava.i @@ -71,7 +71,7 @@ class Spi; /* initialize mraa */ globVM = vm; mraa_init(); - return JNI_VERSION_1_8; + return JNI_VERSION_1_6; } %}