From c072558b90f1bbedc2022b0f30c8b1ac4712538e Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 18 Feb 2011 09:50:58 +0100
Subject: Imported Upstream version 2011.02.15

---
 src/pkg/rpc/jsonrpc/server.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/pkg/rpc/jsonrpc/server.go')

diff --git a/src/pkg/rpc/jsonrpc/server.go b/src/pkg/rpc/jsonrpc/server.go
index bf53bda8d..9c6b8b40d 100644
--- a/src/pkg/rpc/jsonrpc/server.go
+++ b/src/pkg/rpc/jsonrpc/server.go
@@ -85,6 +85,9 @@ func (c *serverCodec) ReadRequestHeader(r *rpc.Request) os.Error {
 }
 
 func (c *serverCodec) ReadRequestBody(x interface{}) os.Error {
+	if x == nil {
+		return nil
+	}
 	// JSON params is array value.
 	// RPC params is struct.
 	// Unmarshal into array containing struct for now.
-- 
cgit v1.2.3