Merge pull request TarsCloud#259 from defool/master

Fix panic when invoke timeout
burncom · Nov 16, 2020 · 7301d63 · 7301d63
2 parents a2ac329 ef07d46
commit 7301d63
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/tars/transport/tarsserver.go b/tars/transport/tarsserver.go
@@ -6,7  6,6 @@ import (
 	"time"
 
 	"github.com/TarsCloud/TarsGo/tars/util/rogger"
-	"github.com/TarsCloud/TarsGo/tars/util/rtimer"
 )
 
 // TLOG  is logger for transport.
@@ -120,17  119,17 @@ func (ts *TarsServer) invoke(ctx context.Context, pkg []byte) []byte {
 	if cfg.HandleTimeout == 0 {
 		rsp = ts.svr.Invoke(ctx, pkg)
 	} else {
-		done := make(chan struct{})
 		invokeDone, cancelFunc := context.WithTimeout(context.Background(), cfg.HandleTimeout)
 		go func() {
 			rsp = ts.svr.Invoke(ctx, pkg)
-			done <- struct{}{}
 			cancelFunc()
 		}()
 		select {
-		case <-rtimer.After(cfg.HandleTimeout):
-			rsp = ts.svr.InvokeTimeout(pkg)
-		case <-done:
 		case <-invokeDone.Done():
 			if len(rsp) == 0 { // The rsp must be none-empty
 				rsp = ts.svr.InvokeTimeout(pkg)
 			}
 		}
-		close(done)
 	}
 	return rsp
 }