>From f22fdc5bc2de9d5e10efd97f5a363e19048065d6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 16 Jun 2010 19:08:28 +0800 Subject: [PATCH 2/2] 2010-06-16 Holger Hans Peter Freyther * Sockets.st: Change AbstractSocket class>>#resolveAddress: to be a single return statement. --- packages/sockets/ChangeLog | 5 +++++ packages/sockets/Sockets.st | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/sockets/ChangeLog b/packages/sockets/ChangeLog index 16659d6..00a3315 100644 --- a/packages/sockets/ChangeLog +++ b/packages/sockets/ChangeLog @@ -1,3 +1,8 @@ +2010-06-16 Holger Hans Peter Freyther + + * Sockets.st: Change AbstractSocket class>>#resolveAddress: to + be a single return statement. + 2010-06-14 Paolo Bonzini * Sockets.st: Do not close a datagram socket upon timeout. diff --git a/packages/sockets/Sockets.st b/packages/sockets/Sockets.st index ce83a20..c32395c 100644 --- a/packages/sockets/Sockets.st +++ b/packages/sockets/Sockets.st @@ -305,17 +305,15 @@ implementation objects.'> ] AbstractSocket class >> resolveAddress: ipAddressOrString [ - | addr | - - ipAddressOrString isString + ^ ipAddressOrString isString ifTrue: [ + | addr | addr := SocketAddress byName: ipAddressOrString. addr isNil ifTrue: - [self error: 'cannot resolve host name ' , ipAddressOrString printString]] - ifFalse: [addr := ipAddressOrString]. - - ^ addr + [self error: 'cannot resolve host name ' , ipAddressOrString printString]. + addr] + ifFalse: [ipAddressOrString]. ] AbstractSocket class >> new: implementation [ -- 1.7.0.1