return immediately on error

espensuenson · espensuenson · commit a35a7705f45e · 2019-09-24T10:58:08.000+02:00
Signed-off-by: Espen Suenson &lt;mail@espensuenson.dk&gt;
diff --git a/store.go b/store.go
@@ -81,9 +81,12 @@ func (c *controller) getStores() []datastore.DataStore {
 
 func (c *controller) getNetworkFromStore(nid string) (*network, error) {
 	ns, err := c.getNetworksFromStore()
+	if err != nil {
+		return nil, err
+	}
 	for _, n := range ns {
 		if n.id == nid {
-			return n, err
+			return n, nil
 		}
 	}
 	return nil, fmt.Errorf("network %s not found", nid)

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,12 @@ func (c *controller) getStores() []datastore.DataStore {`
`81`	`81`
`82`	`82`	`func (c controller) getNetworkFromStore(nid string) (network, error) {`
`83`	`83`	`ns, err := c.getNetworksFromStore()`
	`84`	`+ if err != nil {`
	`85`	`+ return nil, err`
	`86`	`+ }`
`84`	`87`	`for _, n := range ns {`
`85`	`88`	`if n.id == nid {`
`86`		`- return n, err`
	`89`	`+ return n, nil`
`87`	`90`	`}`
`88`	`91`	`}`
`89`	`92`	`return nil, fmt.Errorf("network %s not found", nid)`