Check if pool is closed when getting a connection

dancannon · dancannon · commit f8df91f23c14 · 2014-08-31T18:45:10.000+01:00
diff --git a/session.go b/session.go
@@ -347,13 +347,17 @@ func (s *Session) noreplyWaitQuery() error {
 
 	return nil
 }
-func (s *Session) getConn() (Connection, error) {
+func (s *Session) getConn() (*Connection, error) {
+	if s.pool == nil {
+		return nil, pool.ErrClosed
+	}
+
 	c, err := s.pool.Get()
 	if err != nil {
-		return Connection{}, err
+		return nil, err
 	}
 
-	return Connection{Conn: c, s: s}, nil
+	return &Connection{Conn: c, s: s}, nil
 }
 
 func (s *Session) checkCache(token int64) (*Cursor, bool) {

Original file line number	Diff line number	Diff line change
`@@ -347,13 +347,17 @@ func (s *Session) noreplyWaitQuery() error {`
`347`	`347`
`348`	`348`	`return nil`
`349`	`349`	`}`
`350`		`-func (s *Session) getConn() (Connection, error) {`
	`350`	`+func (s Session) getConn() (Connection, error) {`
	`351`	`+ if s.pool == nil {`
	`352`	`+ return nil, pool.ErrClosed`
	`353`	`+ }`
	`354`	`+`
`351`	`355`	`c, err := s.pool.Get()`
`352`	`356`	`if err != nil {`
`353`		`- return Connection{}, err`
	`357`	`+ return nil, err`
`354`	`358`	`}`
`355`	`359`
`356`		`- return Connection{Conn: c, s: s}, nil`
	`360`	`+ return &Connection{Conn: c, s: s}, nil`
`357`	`361`	`}`
`358`	`362`
`359`	`363`	`func (s Session) checkCache(token int64) (Cursor, bool) {`