mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 06:35:42 +00:00
Merge SetRetval into FinalizeParams. Check invokeResult when doing cleanup in FinalizeParams. Not part of build. a=mkaply.
Original committer: pedemont%us.ibm.com Original revision: 1.32 Original date: 2005/04/14 21:46:10
This commit is contained in:
parent
102340597d
commit
681ccd1137
@ -689,16 +689,12 @@ JavaXPCOMInstance::~JavaXPCOMInstance()
|
||||
|
||||
nsresult
|
||||
GetNewOrUsedJavaObject(JNIEnv* env, nsISupports* aXPCOMObject,
|
||||
const nsIID& aIID, jobject* aResult, PRBool* aIsNewProxy)
|
||||
const nsIID& aIID, jobject* aResult)
|
||||
{
|
||||
NS_PRECONDITION(aResult != nsnull, "null ptr");
|
||||
if (!aResult)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
if (aIsNewProxy) {
|
||||
*aIsNewProxy = PR_FALSE;
|
||||
}
|
||||
|
||||
nsresult rv;
|
||||
nsJavaXPTCStub* stub = nsnull;
|
||||
aXPCOMObject->QueryInterface(NS_GET_IID(nsJavaXPTCStub), (void**) &stub);
|
||||
@ -719,9 +715,6 @@ GetNewOrUsedJavaObject(JNIEnv* env, nsISupports* aXPCOMObject,
|
||||
|
||||
// No Java object is associated with the given XPCOM object, so we
|
||||
// create a Java proxy.
|
||||
if (aIsNewProxy) {
|
||||
*aIsNewProxy = PR_TRUE;
|
||||
}
|
||||
return CreateJavaProxy(env, aXPCOMObject, aIID, aResult);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user