Bug fix for 12702.

Adding notes to remove nsIAtom comparison by string.
This commit is contained in:
dougt%netscape.com 1999-09-01 20:06:30 +00:00
parent b37dfd2d1c
commit 4b6c318cdc
2 changed files with 13 additions and 21 deletions

View File

@ -77,29 +77,18 @@ nsNetModRegEntry::Equals(nsINetModRegEntry* aEntry, PRBool *_retVal)
rv = aEntry->GetTopic(&topic);
if (NS_FAILED(rv))
return rv;
if (topic) {
nsAllocator::Free(topic);
topic=0;
}
if (topic && PL_strcmp(topic, mTopic))
return NS_OK;
nsCOMPtr<nsIEventQueue> entryEventQ;
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
if (NS_FAILED(rv))
return rv;
rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), getter_AddRefs(entryEventQ));
if (NS_FAILED(rv) || mEventQ != entryEventQ)
{
return rv;
nsCOMPtr<nsINetNotify> aSyncProxy;
rv = aEntry->GetSyncProxy(getter_AddRefs(aSyncProxy));
if(aSyncProxy == mSyncProxy)
{
*_retVal = PR_TRUE;
}
nsAllocator::Free(topic);
}
*_retVal = PR_TRUE;
return rv;
}

View File

@ -178,6 +178,10 @@ PRInt32 nsHTTPHeaderArray::GetEntry(nsIAtom* aHeader, nsHeaderEntry** aResult)
count = 0;
(void)mHTTPHeaders->Count(&count);
PRUnichar* aHeaderString;
aHeader->GetUnicode( &aHeaderString );
for (i = 0; i < count; i++) {
nsISupports *entry = nsnull;
nsHeaderEntry* element;
@ -185,9 +189,8 @@ PRInt32 nsHTTPHeaderArray::GetEntry(nsIAtom* aHeader, nsHeaderEntry** aResult)
entry = mHTTPHeaders->ElementAt(i);
element = NS_STATIC_CAST(nsHeaderEntry*, entry);
PRUnichar* aHeaderString;
//TODO get rid of the string compare. see bug 12755.
PRUnichar* elementString;
aHeader->GetUnicode( &aHeaderString );
element->mAtom.get()->GetUnicode( &elementString );
if (nsCRT::strcmp(aHeaderString, elementString) == 0)