From 7dfdba6cf7ef762523b42a73715d24378aa15ca9 Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Wed, 11 Apr 2018 14:54:05 +0900
Subject: [PATCH] ing

---
 registry/rest-registry.go | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/registry/rest-registry.go b/registry/rest-registry.go
index cf4b1a4..cbafcbb 100644
--- a/registry/rest-registry.go
+++ b/registry/rest-registry.go
@@ -101,7 +101,8 @@ func (rr *restRegistry) Invoke(method string, params []string, leadingParams ...
 
 	var in []reflect.Value
 	pValues, pInstances := methodSpec.ParamValues()
-	var lParamLen int
+
+	lParamLen := 0
 	if nil != leadingParams {
 		lParamLen = len(leadingParams)
 	}
@@ -111,22 +112,10 @@ func (rr *restRegistry) Invoke(method string, params []string, leadingParams ...
 			return nil, err
 		}
 
-		for indexI := 0; indexI < lParamLen; indexI++ {
-			i := pInstances[indexI]
-			rv := reflect.ValueOf(i)
-			iv := reflect.ValueOf(leadingParams[indexI])
-			switch reflect.TypeOf(i).Elem().Kind() {
-			case reflect.Struct:
-				rv.Elem().Set(iv.Elem())
-			default:
-				rv.Elem().Set(iv)
-			}
-		}
-
 		pCount := len(pInstances)
 		in = make([]reflect.Value, pCount+1)
 
-		for indexI := 0; indexI < pCount; indexI++ {
+		for indexI := lParamLen; indexI < pCount; indexI++ {
 			if pValues[indexI].Type().Kind() == reflect.Ptr && pValues[indexI].Type().Elem().Kind() != reflect.Struct {
 				in[indexI+1] = reflect.Indirect(pValues[indexI])
 			} else {
@@ -138,6 +127,10 @@ func (rr *restRegistry) Invoke(method string, params []string, leadingParams ...
 	}
 	in[0] = serviceSpec.ReceiverValue()
 
+	for indexI := 0; indexI < lParamLen; indexI++ {
+		in[indexI+1] = reflect.ValueOf(leadingParams[indexI])
+	}
+
 	// Call the service method.
 	returnValues := methodSpec.Call(in)