luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Remove unnecessary nil checks

This commit is contained in:
Preetha Appan 2018-03-27 10:59:42 -05:00
parent c21c2da690
commit 6d16afc65c
No known key found for this signature in database
GPG Key ID: 9F7C19990A50EAFC
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/consul/server.go
View File

@ -888,9 +888,6 @@ func (s *Server) KeyManagerLAN() *serf.KeyManager {
// KeyManagerWAN returns the WAN Serf keyring manager // KeyManagerWAN returns the WAN Serf keyring manager
func (s *Server) KeyManagerWAN() *serf.KeyManager { func (s *Server) KeyManagerWAN() *serf.KeyManager {
if s.serfWAN == nil {
return nil
}
return s.serfWAN.KeyManager() return s.serfWAN.KeyManager()
} }

3
agent/router/router.go
View File

@ -116,9 +116,6 @@ func (r *Router) Shutdown() {
// AddArea registers a new network area with the router. // AddArea registers a new network area with the router.
func (r *Router) AddArea(areaID types.AreaID, cluster RouterSerfCluster, pinger Pinger, useTLS bool) error { func (r *Router) AddArea(areaID types.AreaID, cluster RouterSerfCluster, pinger Pinger, useTLS bool) error {
if cluster == nil {
return nil
}
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()