Merge branch 'master' of https://github.com/micro/go-micro into runtime-multitenancy

This commit is contained in:
Ben Toogood 2020-05-19 11:02:40 +01:00
commit c4e3f8c336
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# Go Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/micro/go-micro?tab=doc) [![Travis CI](https://api.travis-ci.org/micro/go-micro.svg?branch=master)](https://travis-ci.org/micro/go-micro) [![Go Report Card](https://goreportcard.com/badge/micro/go-micro)](https://goreportcard.com/report/github.com/micro/go-micro)
# Go Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/micro/go-micro?tab=doc) [![Travis CI](https://api.travis-ci.org/micro/go-micro.svg?branch=master)](https://travis-ci.org/micro/go-micro) [![Go Report Card](https://goreportcard.com/badge/micro/go-micro)](https://goreportcard.com/report/github.com/micro/go-micro) <a href="https://slack.micro.mu"><img src="https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen" alt="Slack Widget"></a>
Go Micro is a framework for distributed systems development.

View File

@ -130,15 +130,15 @@ func (r *rpcStream) Error() error {
}
func (r *rpcStream) Close() error {
r.RLock()
r.Lock()
select {
case <-r.closed:
r.RUnlock()
r.Unlock()
return nil
default:
close(r.closed)
r.RUnlock()
r.Unlock()
// send the end of stream message
if r.sendEOS {