Inline and rename

Author: DaveCTurner

server/src/main/java/org/elasticsearch/cluster/coordination/PeerFinder.java

@@ -97,7 +97,7 @@ public void activate(final DiscoveryNodes lastAcceptedNodes) {
             active = true;
             this.lastAcceptedNodes = lastAcceptedNodes;
             leader = Optional.empty();
-            handleWakeUpUnderLock();
+            handleWakeUp();
         }
     }
 
@@ -106,7 +106,7 @@ public void deactivate(DiscoveryNode leader) {
             logger.trace("deactivating PeerFinder and setting leader to {}", leader);
             if (active) {
                 active = false;
-                handleWakeUpUnderLock();
+                handleWakeUp();
             }
             this.leader = Optional.of(leader);
             assert assertInactiveWithNoKnownPeers();
@@ -159,12 +159,6 @@ public interface TransportAddressConnector {
         void connectToRemoteMasterNode(TransportAddress transportAddress, ActionListener<DiscoveryNode> listener);
     }
 
-    private void handleWakeUp() {
-        synchronized (mutex) {
-            handleWakeUpUnderLock();
-        }
-    }
-
     private List<DiscoveryNode> getKnownPeers() {
         assert active;
         assert holdsLock() : "PeerFinder mutex not held";
@@ -184,7 +178,7 @@ private Peer createConnectingPeer(TransportAddress transportAddress) {
         return peer;
     }
 
-    private void handleWakeUpUnderLock() {
+    private void handleWakeUp() {
         assert holdsLock() : "PeerFinder mutex not held";
 
         for (final Peer peer : peersByAddress.values()) {
@@ -210,7 +204,9 @@ private void handleWakeUpUnderLock() {
         futureExecutor.schedule(new Runnable() {
             @Override
             public void run() {
-                handleWakeUp();
+                synchronized (mutex) {
+                    handleWakeUp();
+                }
             }
 
             @Override