post-submit tweaks to previous cl

R=rsc
DELTA=5  (4 added, 1 deleted, 0 changed)
OCL=31690
CL=31692

diff --git a/src/pkg/rpc/client.go b/src/pkg/rpc/client.go
index 122763f4e8bdfbd0675af86911063154c6616004..c4e8a6bc7bff7ff2e400c4499db9e2ad42ee0247 100644 (file)
--- a/src/pkg/rpc/client.go
+++ b/src/pkg/rpc/client.go
@@ -43,8 +43,8 @@ func (client *Client) send(c *Call) {
        // Register this call.
        client.Lock();
        if client.shutdown != nil {
-               client.Unlock();
                c.Error = client.shutdown;
+               client.Unlock();
                doNotBlock := c.Done <- c;
                return;
        }
@@ -72,6 +72,9 @@ func (client *Client) serve() {
                response := new(Response);
                err = client.dec.Decode(response);
                if err != nil {
+                       if err == os.EOF {
+                               err = io.ErrUnexpectedEOF;
+                       }
                        break
                }
                seq := response.Seq;