Merge pull request #6186 from gyuho/grpcproxy-fix

proxy/grpcproxy: fix nil-map assign to 'singles'
release-3.1
Gyu-Ho Lee 2016-08-15 16:25:02 -07:00 committed by GitHub
commit b125d590cf
1 changed files with 3 additions and 2 deletions

View File

@ -49,8 +49,9 @@ func (wp *watchProxy) Watch(stream pb.Watch_WatchServer) (err error) {
wp.mu.Unlock()
sws := serverWatchStream{
cw: wp.cw,
groups: &wp.wgs,
cw: wp.cw,
groups: &wp.wgs,
singles: make(map[int64]*watcherSingle),
id: wp.nextStreamID,
gRPCStream: stream,