From fa12ce8a461513c6858441b1c3da5da87bddee1c Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 27 Sep 2006 15:17:10 +0000 Subject: [PATCH] Throw exception before freeing globals. Original committer: pedemont%us.ibm.com Original revision: 1.14 Original date: 2004/12/21 23:35:02 git-svn-id: svn://10.0.0.236/trunk@212586 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp b/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp index ed6ccbe3254..d8c42334cb3 100644 --- a/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp +++ b/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp @@ -82,8 +82,8 @@ GECKO_NATIVE(initEmbedding) (JNIEnv* env, jclass, jobject aMozBinDirectory, } } - FreeJavaGlobals(env); ThrowXPCOMException(env, NS_FAILED(rv) ? rv : NS_ERROR_FAILURE); + FreeJavaGlobals(env); } extern "C" JNIEXPORT void JNICALL @@ -142,8 +142,8 @@ XPCOM_NATIVE(initXPCOM) (JNIEnv* env, jclass, jobject aMozBinDirectory, } } - FreeJavaGlobals(env); ThrowXPCOMException(env, NS_FAILED(rv) ? rv : NS_ERROR_FAILURE); + FreeJavaGlobals(env); return nsnull; }