Merge pull request contiv#23 from dseevr/fix_unreturned_error

unclejack · web-flow · commit 77da460780b8 · 2017-10-25T11:09:53.000-07:00
etcdClient.go: fixed a bug where nil was returned instead of err
diff --git a/etcdClient.go b/etcdClient.go
@@ -161,7 +161,7 @@ func (ep *EtcdClient) ListDir(key string) ([]string, error) {
 			}
 		}
 		if err != nil {
-			return nil, nil
+			return nil, err
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (ep *EtcdClient) ListDir(key string) ([]string, error) {`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`if err != nil {`
`164`		`- return nil, nil`
	`164`	`+ return nil, err`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`