From bc0490ae2663b15c1e82b1c7ff80ea2afb6bd483 Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 27 Sep 2006 15:19:14 +0000 Subject: [PATCH] Bug 337675 - improper automatic nsISupportsWeakReference handling for java-based xpcom objects. XULRunner only. r=bsmedberg Original committer: pedemont%us.ibm.com Original revision: 1.45 Original date: 2006/06/09 13:30:24 --- extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp index 2ba718b93bad..c4918849a3dc 100644 --- a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp +++ b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp @@ -820,7 +820,7 @@ GetNewOrUsedJavaObject(JNIEnv* env, nsISupports* aXPCOMObject, nsresult GetNewOrUsedXPCOMObject(JNIEnv* env, jobject aJavaObject, const nsIID& aIID, - nsISupports** aResult, PRBool* aIsXPTCStub) + nsISupports** aResult) { NS_PRECONDITION(aResult != nsnull, "null ptr"); if (!aResult) @@ -849,16 +849,9 @@ GetNewOrUsedXPCOMObject(JNIEnv* env, jobject aJavaObject, const nsIID& aIID, rv = rootObject->QueryInterface(aIID, (void**) aResult); NS_ENSURE_SUCCESS(rv, rv); - if (aIsXPTCStub) { - *aIsXPTCStub = PR_FALSE; - } return NS_OK; } - if (aIsXPTCStub) { - *aIsXPTCStub = PR_TRUE; - } - nsJavaXPTCStub* stub; rv = gJavaToXPTCStubMap->Find(env, aJavaObject, aIID, &stub); NS_ENSURE_SUCCESS(rv, rv);