fix pipe.Close where io.EOF not reached

swdunlop · swdunlop · commit b5e15fb6d9f3 · 2016-01-08T15:31:33.000-08:00
diff --git a/jqpipe.go b/jqpipe.go
@@ -108,9 +108,8 @@ func (p *Pipe) Next() (json.RawMessage, error) {
 func (p *Pipe) Close() error {
 	if p.stdout != nil {
 		p.stdout.Close()
-		return nil
 	}
-	if p.jq != nil {
+	if p.jq == nil {
 		return nil
 	}
 	if p.jq.ProcessState != nil && p.jq.ProcessState.Exited() {

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,8 @@ func (p *Pipe) Next() (json.RawMessage, error) {`
`108`	`108`	`func (p *Pipe) Close() error {`
`109`	`109`	`if p.stdout != nil {`
`110`	`110`	`p.stdout.Close()`
`111`		`- return nil`
`112`	`111`	`}`
`113`		`- if p.jq != nil {`
	`112`	`+ if p.jq == nil {`
`114`	`113`	`return nil`
`115`	`114`	`}`
`116`	`115`	`if p.jq.ProcessState != nil && p.jq.ProcessState.Exited() {`