mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
make sure to unlock after an exception
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39565 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
dcd8f5a610
commit
52de4bf68b
1 changed files with 10 additions and 2 deletions
|
@ -1789,7 +1789,8 @@ static BOOL isPlistObject(id o)
|
|||
- (BOOL) synchronize
|
||||
{
|
||||
NSDate *saved;
|
||||
BOOL wasLocked;
|
||||
BOOL isLocked = NO;
|
||||
BOOL wasLocked = NO;
|
||||
BOOL result = YES;
|
||||
BOOL haveChange = NO;
|
||||
|
||||
|
@ -1825,6 +1826,7 @@ static BOOL isPlistObject(id o)
|
|||
NSEnumerator *enumerator;
|
||||
NSString *domainName;
|
||||
|
||||
isLocked = YES;
|
||||
haveChange = [self _readDefaults];
|
||||
if (YES == haveChange)
|
||||
{
|
||||
|
@ -1867,8 +1869,9 @@ static BOOL isPlistObject(id o)
|
|||
{
|
||||
updateCache(self);
|
||||
}
|
||||
if (NO == wasLocked)
|
||||
if (YES == isLocked && NO == wasLocked)
|
||||
{
|
||||
isLocked = NO;
|
||||
[self _unlockDefaultsFile];
|
||||
}
|
||||
}
|
||||
|
@ -1878,6 +1881,11 @@ static BOOL isPlistObject(id o)
|
|||
{
|
||||
[_lastSync release];
|
||||
_lastSync = saved;
|
||||
if (YES == isLocked && NO == wasLocked)
|
||||
{
|
||||
isLocked = NO;
|
||||
[self _unlockDefaultsFile];
|
||||
}
|
||||
[_lock unlock];
|
||||
[localException raise];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue