opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some fix

Browse Source
This commit is contained in:
iamqizhao
2016-07-15 11:02:03 -07:00
parent 69e799fc76
commit ec7eacfcc4
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stream.go
View File

@ -190,9 +190,7 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
case <-t.Error(): case <-t.Error():
// Incur transport error, simply exit. // Incur transport error, simply exit.
case <-s.Done(): case <-s.Done():
err := Errorf(s.StatusCode(), s.StatusDesc()) // Simply exit. Leave the next I/O op to do cleanup.
cs.finish(err)
cs.closeTransportStream(err)
case <-s.Context().Done(): case <-s.Context().Done():
err := s.Context().Err() err := s.Context().Err()
cs.finish(err) cs.finish(err)

2
test/end2end_test.go
View File

@ -1536,7 +1536,7 @@ func testClientStreamingError(t *testing.T, e env) {
t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, req, err) t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, req, err)
} }
for { for {
if err := stream.Send(req); err == nil { if err := stream.Send(req); err != io.EOF {
continue continue
} }
if _, err := stream.CloseAndRecv(); grpc.Code(err) != codes.NotFound { if _, err := stream.CloseAndRecv(); grpc.Code(err) != codes.NotFound {