From 3f3c036381243160ef88ea2d27d2edb1f69debda Mon Sep 17 00:00:00 2001
From: Adam Holmberg <Adam.Holmberg@datastax.com>
Date: Tue, 16 Sep 2014 14:18:33 -0500
Subject: [PATCH] Fix seg fault on overloaded connection (CPP-167)

Improper static cast and use of pointer in timeout callback
Also removed unused parameter in Pool::maybe_notify_ready()
---
 src/pool.cpp | 11 ++++++-----
 src/pool.hpp |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pool.cpp b/src/pool.cpp
index 0cf2d5e18..3a27d03a7 100644
--- a/src/pool.cpp
+++ b/src/pool.cpp
@@ -63,6 +63,7 @@ void Pool::connect() {
       spawn_connection();
     }
     state_ = POOL_STATE_CONNECTING;
+    maybe_notify_ready();
   }
 }
 
@@ -137,7 +138,7 @@ void Pool::defunct() {
   close();
 }
 
-void Pool::maybe_notify_ready(Connection* connection) {
+void Pool::maybe_notify_ready() {
   // This will notify ready even if all the connections fail.
   // it is up to the holder to inspect state
   if (state_ == POOL_STATE_CONNECTING && connections_pending_.empty()) {
@@ -201,7 +202,7 @@ Connection* Pool::find_least_busy() {
 
 void Pool::on_connection_ready(Connection* connection) {
   connections_pending_.erase(connection);
-  maybe_notify_ready(connection);
+  maybe_notify_ready();
 
   connections_.push_back(connection);
   return_connection(connection);
@@ -225,12 +226,12 @@ void Pool::on_connection_closed(Connection* connection) {
     defunct();
   }
 
-  maybe_notify_ready(connection);
+  maybe_notify_ready();
   maybe_close();
 }
 
-void Pool::on_pending_request_timeout(void* data) {
-  RequestHandler* request_handler = static_cast<RequestHandler*>(data);
+void Pool::on_pending_request_timeout(RequestTimer* timer) {
+  RequestHandler* request_handler = static_cast<RequestHandler*>(timer->data());
   pending_requests_.remove(request_handler);
   request_handler->retry(RETRY_WITH_NEXT_HOST);
   maybe_close();
diff --git a/src/pool.hpp b/src/pool.hpp
index c39657081..35a0a8400 100644
--- a/src/pool.hpp
+++ b/src/pool.hpp
@@ -68,14 +68,14 @@ class Pool : public RefCounted<Pool> {
 
 private:
   void defunct();
-  void maybe_notify_ready(Connection* connection);
+  void maybe_notify_ready();
   void maybe_close();
   void spawn_connection();
   void maybe_spawn_connection();
 
   void on_connection_ready(Connection* connection);
   void on_connection_closed(Connection* connection);
-  void on_pending_request_timeout(void* data);
+  void on_pending_request_timeout(RequestTimer* data);
 
   Connection* find_least_busy();