simplify last change ... server connection names are automatically

unregistered when the connection is invalidated.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@35678 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-10-12 18:07:34 +00:00
parent 9e92e65b75
commit 044f9254bb

View file

@ -846,13 +846,7 @@ findMode(NSDictionary* d, NSString* s)
if ([connection isKindOfClass: [NSConnection class]]) if ([connection isKindOfClass: [NSConnection class]])
{ {
if (connection == EcProcConnection) if (connection == [proxy connectionForProxy])
{
[EcProcConnection registerName: nil
withNameServer: [NSSocketPortNameServer sharedInstance]];
DESTROY(EcProcConnection);
}
else if (connection == [proxy connectionForProxy])
{ {
[EcProc cmdDbg: cmdConnectDbg [EcProc cmdDbg: cmdConnectDbg
msg: @"lost connection - clearing %@.", msg: @"lost connection - clearing %@.",
@ -2761,6 +2755,8 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
[alarmDestination shutdown]; [alarmDestination shutdown];
[alarmDestination release]; [alarmDestination release];
[EcProcConnection invalidate];
{ {
NSArray *keys; NSArray *keys;
unsigned index; unsigned index;
@ -2775,9 +2771,6 @@ NSLog(@"Ignored attempt to set timer interval to %g ... using 10.0", interval);
} }
} }
[EcProcConnection registerName: nil
withNameServer: [NSSocketPortNameServer sharedInstance]];
exit(status); exit(status);
} }