Index: vm_shutdown.cpp =================================================================== --- vm_shutdown.cpp (revision 572752) +++ vm_shutdown.cpp (working copy) @@ -89,6 +89,11 @@ } static void vm_shutdown_callback() { + //wjw + hythread_t self = hythread_self(); + vm_thread_t vm_thread = (vm_thread_t) hythread_tls_get(self, TM_THREAD_VM_TLS_KEY); + jthread_detach(vm_thread->java_thread); + //wjw hythread_exit(NULL); }