Backed out changeset d1c1aec94228 (bug 967310) for causing Android 2.2 Armv6 Opt XPCShell Test failures on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2014-06-23 13:07:09 +02:00
parent f9c027ef68
commit 8e64cacd96

View File

@ -1690,6 +1690,12 @@ CacheFile::WriteMetadataIfNeededLocked(bool aFireAndForget)
return;
}
if (!aFireAndForget) {
// if aFireAndForget is set, we are called from dtor. Write
// scheduler hard-refers CacheFile otherwise, so we cannot be here.
CacheFileIOManager::UnscheduleMetadataWrite(this);
}
if (NS_FAILED(mStatus))
return;
@ -1697,12 +1703,6 @@ CacheFile::WriteMetadataIfNeededLocked(bool aFireAndForget)
mWritingMetadata || mOpeningFile)
return;
if (!aFireAndForget) {
// if aFireAndForget is set, we are called from dtor. Write
// scheduler hard-refers CacheFile otherwise, so we cannot be here.
CacheFileIOManager::UnscheduleMetadataWrite(this);
}
LOG(("CacheFile::WriteMetadataIfNeededLocked() - Writing metadata [this=%p]",
this));