Author: rfm
Date: Thu Oct 15 12:37:31 2015
New Revision: 39070
URL: http://svn.gna.org/viewcvs/gnustep?rev=39070&view=rev
Log:
Allow for connection already being invalid
Modified:
libs/ec/trunk/EcTest.h
libs/ec/trunk/EcTest.m
Modified: libs/ec/trunk/EcTest.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcTest.h?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- libs/ec/trunk/EcTest.h (original)
+++ libs/ec/trunk/EcTest.h Thu Oct 15 12:37:31 2015
@@ -92,7 +92,8 @@
/** This function shuts down the remote process, gracefully if possible,
* but then with a kill if graceful shutdown fails.<br />
- * Returns YES on graceful shutdown, NO on timeout.
+ * Returns YES on graceful shutdown, NO on timeout (or if the connection
+ * had already been invalidated).
*/
extern BOOL
EcTestShutdown(id<EcTest> process, NSTimeInterval timeout);
Modified: libs/ec/trunk/EcTest.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcTest.m?rev=39070&r1=39069&r2=39070&view=diff
==============================================================================
--- libs/ec/trunk/EcTest.m (original)
+++ libs/ec/trunk/EcTest.m Thu Oct 15 12:37:31 2015
@@ -185,6 +185,11 @@
NSDate *when;
conn = [(NSDistantObject*)process connectionForProxy];
+ if (NO == [conn isValid])
+ {
+ [[conn sendPort] invalidate];
+ return NO;
+ }
pid = [(id<CmdClient>)process processIdentifier];
[(id<CmdClient>)process cmdQuit: 0];
if (timeout > 0)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
