From 133727bd0cae7f4a5f3cffc0f906d19afd865065 Mon Sep 17 00:00:00 2001 From: "David G. Andersen" Date: Sat, 22 Sep 2012 05:53:44 +1000 Subject: [PATCH] [release-branch.go1] net/rpc: fix typo in documentation, clarify semantics of error return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ««« backport ef713d7587f2 net/rpc: fix typo in documentation, clarify semantics of error return Several of my students were confused by trying to use both the error return and a reply return, so I figured it was worth explicitly clarifying that returning an error overrides the reply. R=golang-dev, r CC=golang-dev https://golang.org/cl/6327051 »»» --- src/pkg/net/rpc/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pkg/net/rpc/server.go b/src/pkg/net/rpc/server.go index 1680e2f0d70..9e0aa0ce206 100644 --- a/src/pkg/net/rpc/server.go +++ b/src/pkg/net/rpc/server.go @@ -24,12 +24,13 @@ where T, T1 and T2 can be marshaled by encoding/gob. These requirements apply even if a different codec is used. - (In future, these requirements may soften for custom codecs.) + (In the future, these requirements may soften for custom codecs.) The method's first argument represents the arguments provided by the caller; the second argument represents the result parameters to be returned to the caller. The method's return value, if non-nil, is passed back as a string that the client - sees as if created by errors.New. + sees as if created by errors.New. If an error is returned, the reply parameter + will not be sent back to the client. The server may handle requests on a single connection by calling ServeConn. More typically it will create a network listener and call Accept or, for an HTTP