From: Sage Weil <sage@inktank.com>
Date: Wed, 6 Jun 2012 16:13:14 +0000 (-0700)
Subject: monclient: be paranoid/defensive about send_log vs log_client==NULL
X-Git-Tag: v0.48argonaut~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78b0bea1d6b56cbca725b376cc938cd6ca99164d;p=ceph.git

monclient: be paranoid/defensive about send_log vs log_client==NULL

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 25b2ede161bd..4bdf9f294153 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -214,10 +214,12 @@ bool MonClient::ms_dispatch(Message *m)
 
 void MonClient::send_log()
 {
-  Message *lm = log_client->get_mon_log_message();
-  if (lm)
-    _send_mon_message(lm);
-  more_log_pending = log_client->are_pending();
+  if (log_client) {
+    Message *lm = log_client->get_mon_log_message();
+    if (lm)
+      _send_mon_message(lm);
+    more_log_pending = log_client->are_pending();
+  }
 }
 
 void MonClient::handle_monmap(MMonMap *m)
@@ -527,8 +529,7 @@ void MonClient::tick()
 
     messenger->send_keepalive(cur_con);
    
-    if (state == MC_STATE_HAVE_SESSION &&
-	log_client) {
+    if (state == MC_STATE_HAVE_SESSION) {
       send_log();
     }
   }