The Trunk: Network-cmm.189.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Network-cmm.189.mcz

commits-2
Chris Muller uploaded a new version of Network to project The Trunk:
http://source.squeak.org/trunk/Network-cmm.189.mcz

==================== Summary ====================

Name: Network-cmm.189
Author: cmm
Time: 25 March 2017, 4:00:02.586946 pm
UUID: ab3be9be-4a52-4f18-a1f6-4cd0ea6843bd
Ancestors: Network-ul.188

Stop throwing errors from Socket>>#closeAndDestroy:.

=============== Diff against Network-ul.188 ===============

Item was changed:
  ----- Method: Socket>>closeAndDestroy: (in category 'connection open/close') -----
+ closeAndDestroy: timeoutSeconds
- closeAndDestroy: timeoutSeconds
  "First, try to close this connection gracefully. If the close attempt fails or times out, abort the connection. In either case, destroy the socket. Do nothing if the socket has already been destroyed (i.e., if its socketHandle is nil)."
+ socketHandle ifNil: [ ^ self ].
+ self isConnected ifTrue: [ self close ].
+ (self waitForDisconnectionFor: timeoutSeconds) ifFalse:
+ [ "The other end has not closed the connect yet, so we will just abort it."
+ [ self primSocketAbortConnection: socketHandle ]
+ on: Error
+ do: [ : err | "ignore error if invalid handle" ] ].
-
- socketHandle ifNil: [ ^self ].
- self isConnected ifTrue: [
- self close.  "Close this end." ].
- (self waitForDisconnectionFor: timeoutSeconds) ifFalse: [
- "The other end has not closed the connect yet, so we will just abort it."
- self primSocketAbortConnection: socketHandle ].
  self destroy!