]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg: allow calling dtor immediately after ctor 2574/head
authorJohn Spray <john.spray@redhat.com>
Thu, 25 Sep 2014 16:01:10 +0000 (17:01 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 25 Sep 2014 16:01:10 +0000 (17:01 +0100)
Asserting on reaper_stop only made sense if the
messenger had ever been started: as it stood,
one couldn't create and destroy a messenger
without also starting and stopping it.

Signed-off-by: John Spray <john.spray@redhat.com>
src/msg/SimpleMessenger.cc

index f1f052bce92a60b47413b0c5c406adc0a4d0e0bc..cf6bc73711bad753e1167945ba077ced0ce08536 100644 (file)
@@ -65,7 +65,7 @@ SimpleMessenger::~SimpleMessenger()
 {
   assert(!did_bind); // either we didn't bind or we shut down the Accepter
   assert(rank_pipe.empty()); // we don't have any running Pipes.
-  assert(reaper_stop && !reaper_started); // the reaper thread is stopped
+  assert(!reaper_started); // the reaper thread is stopped
 }
 
 void SimpleMessenger::ready()