Bug 340022 - Virtual machine deadlock can happen on finalization of Java XPCOM proxies. patch by ttudor, r=jhpedemonte

git-svn-id: svn://10.0.0.236/trunk@199062 18797224-902f-48f8-a5cc-f745e15eee43
2006-06-05 21:09:02 +00:00
parent eed105f2b9
commit 59ba9d5452
1 changed files with 2 additions and 0 deletions
--- a/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
+++ b/mozilla/extensions/java/xpcom/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;
      }
    }