Browse Source

Merge pull request #6186 from gyuho/grpcproxy-fix

proxy/grpcproxy: fix nil-map assign to 'singles'
Gyu-Ho Lee 9 years ago
parent
commit
b125d590cf
1 changed files with 3 additions and 2 deletions
  1. 3 2
      proxy/grpcproxy/watch.go

+ 3 - 2
proxy/grpcproxy/watch.go

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