Fix MultiGetKey function (#2824)

Fixes #2797
TykTechnologies · Jan 26, 2020 · 2ebfe1d · 2ebfe1d
1 parent 0b54d56
commit 2ebfe1d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/gateway/rpc_storage_handler.go b/gateway/rpc_storage_handler.go
@@ -202,15 +202,17 @@ func (r *RPCStorageHandler) GetRawKey(keyName string) (string, error) {
 }
 
 func (r *RPCStorageHandler) GetMultiKey(keyNames []string) ([]string, error) {
+	var err error
+	var value string
+
 	for _, key := range keyNames {
-		if value, err := r.GetKey(key); err != nil {
-			return nil, err
-		} else {
+		value, err = r.GetKey(key)
+		if err == nil {
 			return []string{value}, nil
 		}
 	}
 
-	return nil, nil
+	return nil, err
 }
 
 func (r *RPCStorageHandler) GetExp(keyName string) (int64, error) {