fix absent context for method without params

powerman · Oct 13, 2016 · 81335e6 · 81335e6
1 parent 817f47b
commit 81335e6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/jsonrpc2/server.go b/jsonrpc2/server.go
@@ -185,6 +185,9 @@ func (c *serverCodec) ReadRequestBody(x interface{}) error {
 	if x == nil {
 		return nil
 	}
+	if x, ok := x.(WithContext); ok {
+		x.SetContext(c.ctx)
+	}
 	if c.req.Params == nil {
 		return nil
 	}
@@ -200,9 +203,6 @@ func (c *serverCodec) ReadRequestBody(x interface{}) error {
 	} else if err := json.Unmarshal(*c.req.Params, x); err != nil {
 		return NewError(errParams.Code, err.Error())
 	}
-	if x, ok := x.(WithContext); ok {
-		x.SetContext(c.ctx)
-	}
 	return nil
 }