From 82ef9cdadd205bd2f0306e721936bdd4b76145a7 Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Thu, 25 Aug 2016 15:48:38 +0200 Subject: [PATCH] Remove unnecessary synchronization --- .../consensus/membership/RaftMembershipManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipManager.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipManager.java index 3d300562a28c5..c4dc12d4420c0 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipManager.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipManager.java @@ -30,10 +30,10 @@ import org.neo4j.coreedge.core.consensus.log.RaftLogEntry; import org.neo4j.coreedge.core.consensus.log.ReadableRaftLog; import org.neo4j.coreedge.core.consensus.outcome.RaftLogCommand; -import org.neo4j.coreedge.core.replication.SendToMyself; import org.neo4j.coreedge.core.consensus.roles.Role; -import org.neo4j.coreedge.core.state.storage.StateStorage; import org.neo4j.coreedge.core.consensus.roles.follower.FollowerStates; +import org.neo4j.coreedge.core.replication.SendToMyself; +import org.neo4j.coreedge.core.state.storage.StateStorage; import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; @@ -143,7 +143,7 @@ private void updateMemberSets() newReplicationMembers.addAll( additionalReplicationMembers ); replicationMembers = newReplicationMembers; - notifyListeners(); + listeners.forEach( Listener::onMembershipChanged ); } /** @@ -244,16 +244,11 @@ public Set replicationMembers() } @Override - public synchronized void registerListener( Listener listener ) + public void registerListener( Listener listener ) { listeners.add( listener ); } - private synchronized void notifyListeners() - { - listeners.forEach( Listener::onMembershipChanged ); - } - boolean uncommittedMemberChangeInLog() { return state.uncommittedMemberChangeInLog();