Merge branch 'feature/nilpoolfix' into develop

Author: dancannon

example_query_select_test.go

@@ -19,6 +19,9 @@ func Example_Get() {
 		Address: url,
 		AuthKey: authKey,
 	})
+	if err != nil {
+		log.Fatalf("Error connecting to DB: %s", err)
+	}
 
 	// Setup table
 	r.Db("test").TableDrop("table").Run(sess)
@@ -59,6 +62,9 @@ func Example_GetAll_Compound() {
 		Address: url,
 		AuthKey: authKey,
 	})
+	if err != nil {
+		log.Fatalf("Error connecting to DB: %s", err)
+	}
 
 	// Setup table
 	r.Db("test").TableDrop("table").Run(sess)

example_query_table_test.go

@@ -12,6 +12,9 @@ func Example_TableCreate() {
 		Address: url,
 		AuthKey: authKey,
 	})
+	if err != nil {
+		log.Fatalf("Error connecting to DB: %s", err)
+	}
 
 	// Setup database
 	r.Db("test").TableDrop("table").Run(sess)
@@ -32,6 +35,9 @@ func Example_IndexCreate() {
 		Address: url,
 		AuthKey: authKey,
 	})
+	if err != nil {
+		log.Fatalf("Error connecting to DB: %s", err)
+	}
 
 	// Setup database
 	r.Db("test").TableDrop("table").Run(sess)
@@ -53,6 +59,9 @@ func Example_IndexCreate_compound() {
 		Address: url,
 		AuthKey: authKey,
 	})
+	if err != nil {
+		log.Fatalf("Error connecting to DB: %s", err)
+	}
 
 	// Setup database
 	r.Db("test").TableDrop("table").Run(sess)

example_test.go

@@ -28,7 +28,7 @@ func Example() {
 		AuthKey: authKey,
 	})
 	if err != nil {
-		log.Fatalln(err.Error())
+		log.Fatalf("Error connecting to DB: %s", err)
 	}
 
 	res, err := r.Expr("Hello World").Run(session)

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) {