зеркало из https://github.com/mozilla/gecko-dev.git
Fix hasAssertion() methods of FTP and Related Links datasources.
This commit is contained in:
Родитель
d755cbc1b2
Коммит
57e9f4498b
|
@ -788,21 +788,8 @@ FTPDataSource::HasAssertion(nsIRDFResource *source,
|
|||
|
||||
// we only have positive assertions in the FTP data source.
|
||||
|
||||
if ((tv) && isFTPURI(source))
|
||||
{
|
||||
if (property == kRDF_type)
|
||||
{
|
||||
if ((nsIRDFResource *)target == kRDF_type)
|
||||
{
|
||||
*hasAssertion = PR_TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = mInner->HasAssertion(source, property, target,
|
||||
tv, hasAssertion);
|
||||
}
|
||||
rv = mInner->HasAssertion(source, property, target,
|
||||
tv, hasAssertion);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
|
|
|
@ -922,27 +922,13 @@ RelatedLinksDataSource::HasAssertion(nsIRDFResource *source,
|
|||
if (! hasAssertion)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
PRBool retVal = PR_FALSE;
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
*hasAssertion = PR_FALSE;
|
||||
|
||||
// we only have positive assertions in the Related Links data source.
|
||||
|
||||
if ((tv) && (source == kNC_RelatedLinksRoot))
|
||||
{
|
||||
if (property == kRDF_type)
|
||||
{
|
||||
if ((nsIRDFResource *)target == kRDF_type)
|
||||
{
|
||||
*hasAssertion = PR_TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (mInner) rv = mInner->HasAssertion(source, property, target, tv, hasAssertion);
|
||||
}
|
||||
if (mInner) rv = mInner->HasAssertion(source, property, target, tv, hasAssertion);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче