From 4f8ba0e7756a1b0647867db0e9b5549b3e82f6b1 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 29 Mar 2013 10:39:56 -0700 Subject: [PATCH] msgr: allow users to mark_down a NULL Connection* Signed-off-by: Greg Farnum Reviewed-by: Sam Just --- src/msg/Messenger.h | 1 + src/msg/SimpleMessenger.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index ec2e33ffdee0c..7205940c118e4 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -476,6 +476,7 @@ public: * discard its outgoing queue, and if the endpoint tries * to reconnect they will discard their queue when we * inform them of the session reset. + * If the Connection* is NULL, this is a no-op. * It does not generate any notifications to the Dispatcher. * * @param con The Connection to mark down. diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index b244e16579edb..46e51dcf9f271 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -585,6 +585,8 @@ void SimpleMessenger::mark_down(const entity_addr_t& addr) void SimpleMessenger::mark_down(Connection *con) { + if (con == NULL) + return; lock.Lock(); Pipe *p = static_cast(con->get_pipe()); if (p) { -- 2.39.5