Update yatl.

[awesomized/libmemcached] / libmemcached / memcached.cc

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index 765b79ab7fd650e16d72a363f841fe06d8f3e55a..bd23f1f1ab8a95671855b124a1d932b907c8b4a5 100644 (file)
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -144,6 +144,7 @@ static void __memcached_free(memcached_st *ptr, bool release_st)
   }
 
   libmemcached_free(ptr, ptr->ketama.continuum);
+  ptr->ketama.continuum= NULL;
 
   memcached_array_free(ptr->_namespace);
   ptr->_namespace= NULL;
@@ -278,12 +279,13 @@ void memcached_servers_reset(memcached_st *self)
 {
   if (self)
   {
+    libmemcached_free(self, self->ketama.continuum);
+    self->ketama.continuum= NULL;
+
     memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
+    memcached_instance_set(self, NULL, 0);
 
-    memcached_instance_set(self, NULL);
-    self->number_of_hosts= 0;
-    memcached_instance_free((org::libmemcached::Instance*)self->last_disconnected_server);
-    self->last_disconnected_server= NULL;
+    memcached_reset_last_disconnected_server(self);
   }
 }