From 1c8638f6606058568b41c586bfcc5898bf41ea3a Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 27 Sep 2006 15:19:07 +0000 Subject: [PATCH] Bug 340022 - Virtual machine deadlock can happen on finalization of Java XPCOM proxies. patch by ttudor, r=jhpedemonte Original committer: pedemont%us.ibm.com Original revision: 1.41 Original date: 2006/06/05 21:09:02 git-svn-id: svn://10.0.0.236/trunk@212703 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp b/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp index d9a82f625f3..b8eda962ef6 100644 --- a/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp +++ b/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp @@ -1757,6 +1757,8 @@ JAVAPROXY_NATIVE(finalizeProxy) (JNIEnv *env, jclass that, jobject aJavaProxy) nsMemory::Free(iid); } NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to RemoveJavaProxy"); + // Release gJavaXPCOMLock before deleting inst (see bug 340022) + lock.unlock(); delete inst; } }