From eae81465c1c815c317cd30e4de6bdf4d59df2340 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Thu, 15 Oct 2015 16:07:19 +0200
Subject: rpc: new RPC implementation with pub/sub support

---
 rpc/api/mergedapi.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'rpc/api/mergedapi.go')

diff --git a/rpc/api/mergedapi.go b/rpc/api/mergedapi.go
index 8f4ef8e60..92e1e2bb7 100644
--- a/rpc/api/mergedapi.go
+++ b/rpc/api/mergedapi.go
@@ -39,9 +39,11 @@ func newMergedApi(apis ...shared.EthereumApi) *MergedApi {
 	mergedApi.methods = make(map[string]shared.EthereumApi)
 
 	for _, api := range apis {
-		mergedApi.apis[api.Name()] = api.ApiVersion()
-		for _, method := range api.Methods() {
-			mergedApi.methods[method] = api
+		if api != nil {
+			mergedApi.apis[api.Name()] = api.ApiVersion()
+			for _, method := range api.Methods() {
+				mergedApi.methods[method] = api
+			}
 		}
 	}
 	return mergedApi
-- 
cgit v1.2.3