vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5954 from heyitsanthony/fix-embed-cfg-validate 

embed: fix nil dereference on error to set up initial cluster
release-3.1
Anthony Romano 2016-07-15 15:41:40 -07:00 committed by GitHub
parent b26f1bb2b6 34602b87ec
commit 4835322aa1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/etcd.go
View File

@ -66,7 +66,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
e = &Etcd{cfg: *inCfg}
cfg := &e.cfg
defer func() {
if err != nil {
if e != nil && err != nil {
e.Close()
e = nil
}
@ -90,7 +90,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
if !isMemberInitialized(cfg) {
urlsmap, token, err = cfg.PeerURLsMapAndToken("etcd")
if err != nil {
return nil, fmt.Errorf("error setting up initial cluster: %v", err)
return e, fmt.Errorf("error setting up initial cluster: %v", err)
}
}