Shutdown cleanly (prevents Kaffe from trapping on exit)

diff --git a/ext/java/java.c b/ext/java/java.c
index 238b9930b23be6759e43d45efa36b22dbf05f683..d14fc4d1c5633d21bc98e4492cef4ad4d6c677b4 100644 (file)
--- 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;
 }
 

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 238b9930b23be6759e43d45efa36b22dbf05f683..d14fc4d1c5633d21bc98e4492cef4ad4d6c677b4 100644 (file)
--- 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;
 }