From 50f3ee431ffdfc2264e5687248764bf47e9d22ca Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Sep 2009 10:41:07 -0700
Subject: [PATCH] msgr: fix null deref setting message connection ref

---
 src/msg/SimpleMessenger.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index ca7c092c260f4..3d6b09085cf1a 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1304,8 +1304,6 @@ void SimpleMessenger::Pipe::reader()
       dout(20) << "reader got MSG" << dendl;
       Message *m = read_message();
 
-      m->set_connection(connection_state->get());
-
       lock.Lock();
       
       if (!m) {
@@ -1318,6 +1316,8 @@ void SimpleMessenger::Pipe::reader()
 	  state == STATE_CONNECTING)
 	continue;
 
+      m->set_connection(connection_state->get());
+
       // check received seq#
       if (m->get_seq() <= in_seq) {
 	dout(-10) << "reader got old message "
-- 
2.39.5