diff --git a/mozilla/extensions/java/xpcom/nsJavaXPTCStub.cpp b/mozilla/extensions/java/xpcom/nsJavaXPTCStub.cpp index 8ccf92de0d6..04538b175f0 100644 --- a/mozilla/extensions/java/xpcom/nsJavaXPTCStub.cpp +++ b/mozilla/extensions/java/xpcom/nsJavaXPTCStub.cpp @@ -200,22 +200,18 @@ nsJavaXPTCStub::QueryInterface(const nsID &aIID, void **aInstancePtr) PRBool nsJavaXPTCStub::SupportsIID(const nsID &iid) { - // Sometimes mIInfo will be null, particularly when nsJavaXPTCStub represents - // a custom (non-Mozilla) interface. - if (mIInfo) { - PRBool match; - nsCOMPtr iter = mIInfo; - do - { - if (NS_SUCCEEDED(iter->IsIID(&iid, &match)) && match) - return PR_TRUE; + PRBool match; + nsCOMPtr iter = mIInfo; + do + { + if (NS_SUCCEEDED(iter->IsIID(&iid, &match)) && match) + return PR_TRUE; - nsCOMPtr parent; - iter->GetParent(getter_AddRefs(parent)); - iter = parent; - } - while (iter != nsnull); + nsCOMPtr parent; + iter->GetParent(getter_AddRefs(parent)); + iter = parent; } + while (iter != nsnull); return PR_FALSE; }