* Allow users to define NO_JNI_DETACH_THREAD to prevent callbacks …

…from reinitializing threads (issue #143)
bytedeco · Nov 22, 2016 · 3abc7bf · 3abc7bf
1 parent 3c1fc9b
commit 3abc7bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Allow users to define `NO_JNI_DETACH_THREAD` to prevent callbacks from reinitializing threads ([issue #143](https://github.com/bytedeco/javacpp/issues/143))
+
 ### November 13, 2016 version 1.2.5
  * Add support for `decltype()` declarations to the `Parser` ([issue #135](https://github.com/bytedeco/javacpp/issues/135))
  * Fix `Generator` when a `FunctionPointer` contains methods that start with "get" or "put" ([issue #137](https://github.com/bytedeco/javacpp/issues/137))

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Generator.java b/src/main/java/org/bytedeco/javacpp/tools/Generator.java
@@ -800,9 +800,11 @@ boolean classes(boolean handleExceptions, boolean defineAdapters, boolean conver
         }
         if (!functions.isEmpty() || !virtualFunctions.isEmpty()) {
             out.println("static JavaCPP_noinline void JavaCPP_detach(bool detach) {");
+            out.println("#ifndef NO_JNI_DETACH_THREAD");
             out.println("    if (detach && JavaCPP_vm->DetachCurrentThread() != JNI_OK) {");
             out.println("        JavaCPP_log(\"Could not detach the JavaVM from the current thread.\");");
             out.println("    }");
+            out.println("#endif");
             out.println("}");
             out.println();
             out.println("static JavaCPP_noinline bool JavaCPP_getEnv(JNIEnv** env) {");