Skip to content
Snippets Groups Projects
Commit b30009ca authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Fix backup trigger call on uninitialized object

parent 97d24699
No related branches found
No related tags found
3 merge requests!510Release,!207WIP: Client Restructure,!203Symmetric broadcast
...@@ -752,7 +752,7 @@ func (c *Client) GetNodeRegistrationStatus() (int, int, error) { ...@@ -752,7 +752,7 @@ func (c *Client) GetNodeRegistrationStatus() (int, int, error) {
"registrations when network is not healthy") "registrations when network is not healthy")
} }
nodes := c.network.GetInstance().GetFullNdf().Get().Nodes nodes := c.network.GetInstance().GetPartialNdf().Get().Nodes
var numRegistered int var numRegistered int
var numStale = 0 var numStale = 0
......
...@@ -197,6 +197,11 @@ func (b *Backup) TriggerBackup(reason string) { ...@@ -197,6 +197,11 @@ func (b *Backup) TriggerBackup(reason string) {
b.mux.RLock() b.mux.RLock()
defer b.mux.RUnlock() defer b.mux.RUnlock()
if b == nil || b.kv == nil {
jww.ERROR.Printf("TriggerBackup called on unitialized object")
return
}
key, salt, params, err := loadBackup(b.kv) key, salt, params, err := loadBackup(b.kv)
if err != nil { if err != nil {
jww.ERROR.Printf("Backup Failed: could not load key, salt, and "+ jww.ERROR.Printf("Backup Failed: could not load key, salt, and "+
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment