From 302ccb0d97d80e1b3f5483975f1af11ec1faaa26 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@php.net>
Date: Fri, 28 Jan 2000 00:32:28 +0000
Subject: Shutdown cleanly (prevents Kaffe from trapping on exit)

---
 ext/java/java.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ext/java/java.c')

diff --git a/ext/java/java.c b/ext/java/java.c
index 238b9930b2..d14fc4d1c5 100644
--- 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;
 }
 
-- 
cgit v1.2.1