qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:44:41 -07:00
Code Releases Activity

net/rpc: improve response reading logic

Browse Source 
CL 5956051 introduced too many call != nil checks, so
attempt to improve this by splitting logic into three
distinct parts.

R=r
CC=golang-dev
https://golang.org/cl/6248048
This commit is contained in:
Alexey Borzenkov 2012-05-26 14:27:36 -07:00 committed by Rob Pike
parent 1423ecb126
commit dcc80e4553
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pkg/net/rpc/client.go
View File

@ -116,24 +116,32 @@ func (client *Client) input() {
delete(client.pending, seq)
client.mutex.Unlock()
if call == nil || response.Error != "" {
// We've got an error response. Give this to the request;
// any subsequent requests will get the ReadResponseBody
// error if there is one.
if call != nil {
call.Error = ServerError(response.Error)
}
switch {
case call == nil:
// We've got no pending call. That usually means that
// WriteRequest partially failed, and call was already
// removed; response is a server telling us about an
// error reading request body. We should still attempt
// to read error body, but there's no one to give it to.
err = client.codec.ReadResponseBody(nil)
if err != nil {
err = errors.New("reading error body: " + err.Error())
}
} else if response.Error == "" {
case response.Error != "":
// We've got an error response. Give this to the request;
// any subsequent requests will get the ReadResponseBody
// error if there is one.
call.Error = ServerError(response.Error)
err = client.codec.ReadResponseBody(nil)
if err != nil {
err = errors.New("reading error body: " + err.Error())
}
call.done()
default:
err = client.codec.ReadResponseBody(call.Reply)
if err != nil {
call.Error = errors.New("reading body " + err.Error())
}
}
if call != nil {
call.done()
}
}