From fbe3e651accca1f82374d4ebd64fff3d164ba612 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 18 Feb 2008 18:39:05 +0000 Subject: [PATCH] Minor cleanup ofcode to break stale locks. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26091 72102866-910b-0410-8b05-ffd578937521 --- Source/NSMessagePortNameServer.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/NSMessagePortNameServer.m b/Source/NSMessagePortNameServer.m index f18fe2ba1..764b66ff2 100644 --- a/Source/NSMessagePortNameServer.m +++ b/Source/NSMessagePortNameServer.m @@ -150,7 +150,7 @@ static void clean_up_names(void) { NSDate *limit = [NSDate dateWithTimeIntervalSinceNow: 2.0]; - while ([dl tryLock] == NO) + while (dl != nil && [dl tryLock] == NO) { if ([limit timeIntervalSinceNow] > 0.0) { @@ -168,13 +168,14 @@ static void clean_up_names(void) { NSLog(@"Failed to break lock on names for " @"NSMessagePortNameServer: %@", localException); + dl = nil; } NS_ENDHANDLER } else { NSLog(@"Failed to lock names for NSMessagePortNameServer"); - return nil; + dl = nil; } } }