зеркало из https://github.com/mozilla/gecko-dev.git
Bug #96053 --> executing a query may not return an end of query.
Checking in for john.marmion@ireland.sun.com r/sr=sspitzer,mscott
This commit is contained in:
Родитель
9920af5208
Коммит
ae630581a9
|
@ -1064,12 +1064,6 @@ nsresult nsAbOutlookDirectory::ExecuteQuery(nsIAbDirectoryQueryArguments *aArgum
|
|||
nsCOMPtr<nsIAbDirectoryQueryResult> result ;
|
||||
nsAbDirectoryQueryResult *newResult = nsnull ;
|
||||
|
||||
newResult = new nsAbDirectoryQueryResult(0, aArguments,
|
||||
nsIAbDirectoryQueryResult::queryResultComplete,
|
||||
0) ;
|
||||
result = newResult ;
|
||||
aListener->OnQueryItem(result) ;
|
||||
|
||||
if (aResultLimit > 0 && nbResults > NS_STATIC_CAST(PRUint32, aResultLimit)) {
|
||||
nbResults = NS_STATIC_CAST(PRUint32, aResultLimit) ;
|
||||
}
|
||||
|
@ -1094,6 +1088,11 @@ nsresult nsAbOutlookDirectory::ExecuteQuery(nsIAbDirectoryQueryArguments *aArgum
|
|||
nsIntegerKey hashKey(aThreadId) ;
|
||||
|
||||
mQueryThreads.Remove(&hashKey) ;
|
||||
newResult = new nsAbDirectoryQueryResult(0, aArguments,
|
||||
nsIAbDirectoryQueryResult::queryResultComplete,
|
||||
0) ;
|
||||
result = newResult ;
|
||||
aListener->OnQueryItem(result) ;
|
||||
return retCode ;
|
||||
}
|
||||
nsresult nsAbOutlookDirectory::GetChildCards(nsISupportsArray **aCards,
|
||||
|
|
Загрузка…
Ссылка в новой задаче