gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16553 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-04-27 07:39:02 +00:00
parent f2fef1860f
commit f38551aed8
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-04-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: ([synchronize]) fix locking to permit
recursive call to this method, ensuring the distributed lock is
only obtained once.
2003-04-17 Richard Frith-Macdonald <rfm@gnu.org> 2003-04-17 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/gnustep/base/GSCategories.h: * Headers/gnustep/base/GSCategories.h:

2
Source/NSDistributedLock.m
View file

@ -138,7 +138,7 @@ static NSFileManager *mgr = nil;
} }
/** /**
* Returns the date at which the lock was aquired by any * Returns the date at which the lock was aquired by <em>any</em>
* NSDistributedLock using the same path. If nothing has * NSDistributedLock using the same path. If nothing has
* the lock, this returns nil. * the lock, this returns nil.
*/ */

30
Source/NSUserDefaults.m
View file

@ -1321,10 +1321,13 @@ static BOOL isPlistObject(id o)
NSDate *started = [NSDateClass date]; NSDate *started = [NSDateClass date];
unsigned long desired; unsigned long desired;
unsigned long attributes; unsigned long attributes;
static BOOL isLocked = NO;
BOOL wasLocked;
[_lock lock]; [_lock lock];
if (_fileLock != nil) wasLocked = isLocked;
if (isLocked == NO && _fileLock != nil)
{ {
while ([_fileLock tryLock] == NO) while ([_fileLock tryLock] == NO)
{ {
@ -1364,6 +1367,7 @@ static BOOL isPlistObject(id o)
} }
RELEASE(arp); RELEASE(arp);
} }
isLocked = YES;
} }
/* /*
@ -1403,7 +1407,11 @@ static BOOL isPlistObject(id o)
} }
if (wantRead == NO) if (wantRead == NO)
{ {
[_fileLock unlock]; if (wasLocked == NO)
{
[_fileLock unlock];
isLocked = NO;
}
[_lock unlock]; [_lock unlock];
return YES; return YES;
} }
@ -1431,7 +1439,11 @@ static BOOL isPlistObject(id o)
if (newDict == nil) if (newDict == nil)
{ {
NSLog(@"Unable to load defaults from '%@'", _defaultsDatabase); NSLog(@"Unable to load defaults from '%@'", _defaultsDatabase);
[_fileLock unlock]; if (wasLocked == NO)
{
[_fileLock unlock];
isLocked = NO;
}
[_lock unlock]; [_lock unlock];
return NO; return NO;
} }
@ -1488,7 +1500,11 @@ static BOOL isPlistObject(id o)
{ {
if (![_persDomains writeToFile: _defaultsDatabase atomically: YES]) if (![_persDomains writeToFile: _defaultsDatabase atomically: YES])
{ {
[_fileLock unlock]; if (wasLocked == NO)
{
[_fileLock unlock];
isLocked = NO;
}
[_lock unlock]; [_lock unlock];
return NO; return NO;
} }
@ -1513,7 +1529,11 @@ static BOOL isPlistObject(id o)
} }
} }
[_fileLock unlock]; if (wasLocked == NO)
{
[_fileLock unlock];
isLocked = NO;
}
[_lock unlock]; [_lock unlock];
return YES; return YES;
} }