]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: don't leak map_in_progress_cond
authorSage Weil <sage@newdream.net>
Sat, 11 Sep 2010 16:54:09 +0000 (09:54 -0700)
committerSage Weil <sage@newdream.net>
Sat, 11 Sep 2010 17:52:43 +0000 (10:52 -0700)
src/osd/OSD.cc

index 448d5a78059120499a18e28f30594b05e49fba04..63b07c3beb56869bb9f9bca409dd5e218f3223ad 100644 (file)
@@ -379,9 +379,11 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger, M
   remove_wq(this, &disk_tp)
 {
   monc->set_messenger(client_messenger);
+
   if (client_messenger != cluster_messenger)
     map_in_progress_cond = new Cond();
-  else map_in_progress_cond = NULL;
+  else
+    map_in_progress_cond = NULL;
   
   osdmap = 0;
 
@@ -400,6 +402,7 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger, M
 
 OSD::~OSD()
 {
+  delete map_in_progress_cond;
   delete class_handler;
   delete osdmap;
   logger_remove(logger);