mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 14754. Shore up unregistration; verify that datasource matches URI to be unregistered. Be 'quiet' if it doesn't.
This commit is contained in:
parent
a622e1d0d7
commit
f8f2fcce60
@ -1007,9 +1007,10 @@ RDFServiceImpl::UnregisterDataSource(nsIRDFDataSource* aDataSource)
|
||||
PLHashEntry** hep =
|
||||
PL_HashTableRawLookup(mNamedDataSources, (*mNamedDataSources->keyHash)(uri), uri);
|
||||
|
||||
NS_ASSERTION(*hep != nsnull, "datasource was never registered");
|
||||
if (! *hep)
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
// It may well be that this datasource was never registered. If
|
||||
// so, don't unregister it.
|
||||
if (! *hep || ((*hep)->value != aDataSource))
|
||||
return NS_OK;
|
||||
|
||||
PL_strfree((char*) (*hep)->key);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user