More clean-ups

[invirt/third/libt4.git] / config.cc

diff --git a/config.cc b/config.cc
index abd2f9c..38c4c05 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -88,8 +88,7 @@ void config::paxos_commit(unsigned instance, const string &value) {
         LOG("is " << mem << " still a member?");
         if (!isamember(mem, newmem) && me != mem) {
             LOG("delete " << mem);
         LOG("is " << mem << " still a member?");
         if (!isamember(mem, newmem) && me != mem) {
             LOG("delete " << mem);

-            invalidate_handle(mem);
-            //handle(mem).invalidate();
+            handle(mem).invalidate();

         }
     }
 
         }
     }
 

@@ -214,8 +213,7 @@ config::heartbeat_t config::doheartbeat(const string &m, lock &cfg_mutex_lock) {
             break;
         case rpc_protocol::atmostonce_failure:
         case rpc_protocol::oldsrv_failure:
             break;
         case rpc_protocol::atmostonce_failure:
         case rpc_protocol::oldsrv_failure:

-            invalidate_handle(m);
-            //h.invalidate();
+            h.invalidate();

             break;
         default:
             LOG("problem with " << m << " (" << ret << ") my vid " << vid << " his vid " << r);
             break;
         default:
             LOG("problem with " << m << " (" << ret << ") my vid " << vid << " his vid " << r);