msgr: don't leak message when sending to a closed connection

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 3887faa77ff5b6006d8010696378d83f540561cd..14053a261a7171d407e0e1dd4ae26f3096ff480f 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -436,7 +436,10 @@ int SimpleMessenger::send_message(Message *m, Connection *con)
   if (pipe) {
     submit_message(m, pipe);
     pipe->put();
-  } // else we raced with reaper()
+  } else {
+    // else we raced with reaper()
+    m->put();
+  }
   return 0;
 }
 
@@ -2335,11 +2338,6 @@ bool SimpleMessenger::register_entity(entity_name_t name)
 
 void SimpleMessenger::submit_message(Message *m, Pipe *pipe)
 { 
-  if (!pipe) {
-    m->put();
-    return;
-  }
-
   lock.Lock();
   if (pipe == dispatch_queue.local_pipe) {
     dout(20) << "submit_message " << *m << " local" << dendl;