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

Make ownership-taking idempotent during unarchiving.

Browse Source 
The previous scheme made it hard to deal with reference-counted objects,
which may be owned by many objects.
This commit is contained in:
Alex Wilson
2012-05-03 08:45:29 +12:00
parent 0a408e4992
commit 4ca2a44779
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/ArchivingManagers.cpp
+2 -8
View File
@@ -299,10 +299,8 @@ BUnarchiveManager::GetArchivableForToken(int32 token,
} }
} }
if (!info.adopted && owning == BUnarchiver::B_ASSUME_OWNERSHIP) if (owning == BUnarchiver::B_ASSUME_OWNERSHIP)
info.adopted = true; info.adopted = true;
else if (info.adopted && owning == BUnarchiver::B_ASSUME_OWNERSHIP)
debugger("Cannot assume ownership of an object that is already owned");
_archivable = info.archivable; _archivable = info.archivable;
return err; return err;
@@ -399,11 +397,7 @@ BUnarchiveManager::AssumeOwnership(BArchivable* archivable)
|| fObjects[token].archivable != archivable) || fObjects[token].archivable != archivable)
return; return;
if (!fObjects[token].adopted) fObjects[token].adopted = true;
fObjects[token].adopted = true;
else {
debugger("Cannot assume ownership of an object that is already owned");
}
} }