Pulling in Mark's fixes for memory leaks in memslap

[m6w6/libmemcached] / libmemcached / memcached_behavior.c

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index 287f8f0ce0ac344a30958b1f1e8efa1e0e51ea6b..351b87cd90be859b25ff73ddd1e24663ed3b6075 100644 (file)
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -38,8 +38,11 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     memcached_quit(ptr);
     break;
   case MEMCACHED_BEHAVIOR_DISTRIBUTION:
-    ptr->distribution= (memcached_server_distribution)(data);
-    break;
+    {
+      ptr->distribution= (memcached_server_distribution)(data);
+      run_distribution(ptr);
+      break;
+    }
   case MEMCACHED_BEHAVIOR_HASH:
     ptr->hash= (memcached_hash)(data);
     break;
@@ -56,12 +59,7 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
     {
       set_behavior_flag(ptr, MEM_USE_SORT_HOSTS, data);
-
-      if (ptr->flags & MEM_USE_SORT_HOSTS)
-      {
-        memcached_quit(ptr);
-        run_distribution(ptr);
-      }
+      run_distribution(ptr);
 
       break;
     }