From: Sage Weil <sage@inktank.com>
Date: Thu, 23 May 2013 17:23:43 +0000 (-0700)
Subject: mon: drop unnecessary conditionals
X-Git-Tag: v0.63~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87cef3d5c314f1d520a90ee27c2b349958bd30e3;p=ceph.git

mon: drop unnecessary conditionals

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

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index bfb9ed4f5dd3..3311d7bae93c 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1081,8 +1081,8 @@ void Paxos::leader_init()
 {
   cancel_events();
   new_value.clear();
-  if (!proposals.empty())
-    finish_contexts(g_ceph_context, proposals, -EAGAIN);
+
+  finish_contexts(g_ceph_context, proposals, -EAGAIN);
 
   if (mon->get_quorum().size() == 1) {
     state = STATE_ACTIVE;
@@ -1118,9 +1118,7 @@ void Paxos::restart()
 
   state = STATE_RECOVERING;
 
-  if (!proposals.empty())
-    finish_contexts(g_ceph_context, proposals, -EAGAIN);
-
+  finish_contexts(g_ceph_context, proposals, -EAGAIN);
   finish_contexts(g_ceph_context, waiting_for_commit, -EAGAIN);
   finish_contexts(g_ceph_context, waiting_for_active, -EAGAIN);
 }