i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageLinkDirectory::_Update(): Don't unlock after delete

Browse Source 
When using an AutoLocker on an object, the lock must be released
explicitly before releasing the last certain reference to that object.
This commit is contained in:
Ingo Weinhold
2011-11-05 17:20:45 +01:00
parent 19ae20e67e
commit c1ef23b188
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp
+3 -1
View File
@@ -175,11 +175,12 @@ PackageLinkDirectory::_Update(PackageLinksListener* listener)
// Always remove all dependency links -- if there's still a package, they // Always remove all dependency links -- if there's still a package, they
// will be re-created below. // will be re-created below.
while (DependencyLink* link = fDependencyLinks.RemoveHead()) { while (DependencyLink* link = fDependencyLinks.RemoveHead()) {
NodeWriteLocker selfLinkLocker(link); NodeWriteLocker linkLocker(link);
if (listener != NULL) if (listener != NULL)
listener->PackageLinkNodeRemoved(link); listener->PackageLinkNodeRemoved(link);
RemoveChild(link); RemoveChild(link);
linkLocker.Unlock();
link->ReleaseReference(); link->ReleaseReference();
} }
@@ -193,6 +194,7 @@ PackageLinkDirectory::_Update(PackageLinksListener* listener)
listener->PackageLinkNodeRemoved(fSelfLink); listener->PackageLinkNodeRemoved(fSelfLink);
RemoveChild(fSelfLink); RemoveChild(fSelfLink);
selfLinkLocker.Unlock();
fSelfLink->ReleaseReference(); fSelfLink->ReleaseReference();
fSelfLink = NULL; fSelfLink = NULL;
} }