cvs: /php4/ext/java java.c
| From: | Sam Ruby | Date: | Fri, 28 Jan 2000 00:32:57 +0000 |
| Subject: | cvs: /php4/ext/java java.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9492@lists.php.net to get a copy of this message | ||
rubys Thu Jan 27 16:32:57 2000 EDT
Modified files:
/php4/ext/java java.c
Log:
Shutdown cleanly (prevents Kaffe from trapping on exit)
Index: php4/ext/java/java.c
diff -u php4/ext/java/java.c:1.10 php4/ext/java/java.c:1.11
--- php4/ext/java/java.c:1.10 Fri Dec 31 17:31:39 1999
+++ php4/ext/java/java.c Thu Jan 27 16:32:27 2000
@@ -101,12 +101,15 @@
*/
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;
}