From: John Spray <john.spray@redhat.com>
Date: Thu, 25 Sep 2014 16:01:10 +0000 (+0100)
Subject: msg: allow calling dtor immediately after ctor
X-Git-Tag: v0.86~32^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a468f358be95632b9501a91f18a07555dedaaf3;p=ceph.git

msg: allow calling dtor immediately after ctor

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>
---

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index f1f052bce92a..cf6bc73711ba 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -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()