Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notify earlier when removing a package node

Browse Source 
Volume::_RemovePackageNode(): Notify listeners before removing the last
package node from the node, . This prevents the size/last modified
indices from not finding the node anymore, since the node would return
a default value instead of the value it was added to the index with.
This commit is contained in:
Ingo Weinhold 2011-07-11 20:35:50 +02:00
parent 15e694e535
commit 0c7ef631d8
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/add-ons/kernel/file_systems/packagefs/Volume.cpp
View File

@ -1274,12 +1274,16 @@ Volume::_RemovePackageNode(Directory* directory, PackageNode* packageNode,
// details.
PackageNode* headPackageNode = unpackingNode->GetPackageNode();
unpackingNode->RemovePackageNode(packageNode);
// If the node doesn't have any more package nodes attached, remove it
// completely.
bool nodeRemoved = false;
if (unpackingNode->GetPackageNode() == NULL) {
// If this is the last package node of the node, remove it completely.
if (unpackingNode->IsOnlyPackageNode(packageNode)) {
// Notify before removing the node. Otherwise the indices might not
// find the node anymore.
_NotifyNodeRemoved(node);
unpackingNode->RemovePackageNode(packageNode);
// we get and put the vnode to notify the VFS
// TODO: We should probably only do that, if the node is known to the
// VFS in the first place.
@ -1293,13 +1297,14 @@ Volume::_RemovePackageNode(Directory* directory, PackageNode* packageNode,
RemoveVNode(node->ID());
PutVNode(node->ID());
}
}
} else {
// The node does at least have one more package node.
unpackingNode->RemovePackageNode(packageNode);
if (nodeRemoved)
_NotifyNodeRemoved(node);
else if (packageNode == headPackageNode) {
_NotifyNodeChanged(node, kAllStatFields,
OldUnpackingNodeAttributes(headPackageNode));
if (packageNode == headPackageNode) {
_NotifyNodeChanged(node, kAllStatFields,
OldUnpackingNodeAttributes(headPackageNode));
}
}
if (!notify)