Skip to content

Commit

Permalink
Merge pull request #941 from guokeno0/master
Browse files Browse the repository at this point in the history
fix toposerver to tolerate nil return from GetEndPoints()
  • Loading branch information
guokeno0 committed Jul 30, 2015
2 parents 81a05f7 + be6fa3d commit 3d6f8eb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion go/vt/vtgate/srv_topo_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ func (server *ResilientSrvTopoServer) GetEndPoints(ctx context.Context, cell, ke
server.endPointCounters.errors.Add(key, 1)
return
}
if len(result.Entries) == 0 {
if result == nil || len(result.Entries) == 0 {
server.endPointCounters.emptyResults.Add(key, 1)
return
}
Expand Down

0 comments on commit 3d6f8eb

Please sign in to comment.