Shutdown cleanly (prevents Kaffe from trapping on exit)

26 years ago · 302ccb0d97
2 changed files with 10 additions and 4 deletions
--- a/ext/java/java.c
+++ b/ext/java/java.c
@ -101,12 +101,15 @@ PHP_INI_END()
 */
 void jvm_destroy() {
  if (php_reflect) (*jenv)->DeleteGlobalRef(jenv, php_reflect);
-  if (jvm) (*jvm)->DestroyJavaVM(jvm);
+  if (jvm) {
+    (*jvm)->DetachCurrentThread(jvm);
+    (*jvm)->DestroyJavaVM(jvm);
+    jvm = 0;
+  }
 #if !(WIN32||WINNT)
  if (javadl) dlclose(javadl);
 #endif
  php_reflect = 0;
-  jvm = 0;
  jenv = 0;
 }

--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@ -101,12 +101,15 @@ PHP_INI_END()
 */
 void jvm_destroy() {
  if (php_reflect) (*jenv)->DeleteGlobalRef(jenv, php_reflect);
-  if (jvm) (*jvm)->DestroyJavaVM(jvm);
+  if (jvm) {
+    (*jvm)->DetachCurrentThread(jvm);
+    (*jvm)->DestroyJavaVM(jvm);
+    jvm = 0;
+  }
 #if !(WIN32||WINNT)
  if (javadl) dlclose(javadl);
 #endif
  php_reflect = 0;
-  jvm = 0;
  jenv = 0;
 }