Fixed readArguments

Author: andot

examples/http_hello_server/http_hello_server.go

@@ -6,12 +6,13 @@ import (
 	"github.com/hprose/hprose-golang/rpc"
 )
 
-func hello(name string) string {
-	return "Hello " + name + "!"
+func hello(name string, context *rpc.HTTPContext) string {
+	return "Hello !" + context.Request.RemoteAddr
 }
 
 func main() {
 	service := rpc.NewHTTPService()
+	service.Debug = true
 	service.AddFunction("hello", hello)
 	http.ListenAndServe(":8080", service)
 }

rpc/base_service.go

@@ -357,14 +357,18 @@ func readArguments(
 	fixArguments func(args []reflect.Value, context ServiceContext),
 	reader *io.Reader,
 	method *Method,
+	hasArgs bool,
 	context ServiceContext) (args []reflect.Value) {
-	if method != nil {
-		reader.JSONCompatible = method.JSONCompatible
-	}
-	if method == nil || context.IsMissingMethod() {
-		return reader.ReadSliceWithoutTag()
+	count := 0
+	if hasArgs {
+		if method != nil {
+			reader.JSONCompatible = method.JSONCompatible
+		}
+		if method == nil || context.IsMissingMethod() {
+			return reader.ReadSliceWithoutTag()
+		}
+		count = reader.ReadCount()
 	}
-	count := reader.ReadCount()
 	ft := method.Function.Type()
 	n := ft.NumIn()
 	if ft.IsVariadic() {
@@ -386,7 +390,9 @@ func readArguments(
 			}
 		}
 	}
-	reader.ReadSlice(args[:count])
+	if hasArgs {
+		reader.ReadSlice(args[:count])
+	}
 	if !ft.IsVariadic() && n > count {
 		fixArguments(args, context)
 	}
@@ -439,12 +445,14 @@ func (service *BaseService) doSingleInvoke(
 	var args []reflect.Value
 	if tag == io.TagList {
 		reader.Reset()
-		args = readArguments(service.FixArguments, reader, method, context)
+		args = readArguments(service.FixArguments, reader, method, true, context)
 		tag = reader.CheckTags([]byte{io.TagTrue, io.TagEnd, io.TagCall})
 		if tag == io.TagTrue {
 			context.setByRef(true)
 			tag = reader.CheckTags([]byte{io.TagEnd, io.TagCall})
 		}
+	} else {
+		args = readArguments(service.FixArguments, reader, method, false, context)
 	}
 	context.setMethod(method)
 	result, err := service.beforeInvoke(name, args, context)