GODRIVER-1323 cleanup connection close logic (#183)

iwysiu · iwysiu · commit 41757403a1c1 · 2019-10-03T13:19:05.000-04:00
diff --git a/x/mongo/driver/topology/connection.go b/x/mongo/driver/topology/connection.go
@@ -431,11 +431,8 @@ func (c *Connection) Close() error {
 		defer c.s.sem.Release(1)
 	}
 	err := c.pool.put(c.connection)
-	if err != nil {
-		return err
-	}
 	c.connection = nil
-	return nil
+	return err
 }
 
 // Expire closes this connection and will closeConnection the underlying socket.
@@ -449,11 +446,8 @@ func (c *Connection) Expire() error {
 		c.s.sem.Release(1)
 	}
 	err := c.close()
-	if err != nil {
-		return err
-	}
 	c.connection = nil
-	return nil
+	return err
 }
 
 // Alive returns if the connection is still alive.

Original file line number	Diff line number	Diff line change
`@@ -431,11 +431,8 @@ func (c *Connection) Close() error {`
`431`	`431`	`defer c.s.sem.Release(1)`
`432`	`432`	`}`
`433`	`433`	`err := c.pool.put(c.connection)`
`434`		`- if err != nil {`
`435`		`- return err`
`436`		`- }`
`437`	`434`	`c.connection = nil`
`438`		`- return nil`
	`435`	`+ return err`
`439`	`436`	`}`
`440`	`437`
`441`	`438`	`// Expire closes this connection and will closeConnection the underlying socket.`
`@@ -449,11 +446,8 @@ func (c *Connection) Expire() error {`
`449`	`446`	`c.s.sem.Release(1)`
`450`	`447`	`}`
`451`	`448`	`err := c.close()`
`452`		`- if err != nil {`
`453`		`- return err`
`454`		`- }`
`455`	`449`	`c.connection = nil`
`456`		`- return nil`
	`450`	`+ return err`
`457`	`451`	`}`
`458`	`452`
`459`	`453`	`// Alive returns if the connection is still alive.`