From 65d28da7c22382e040363c607840d5ab6e6b45da Mon Sep 17 00:00:00 2001 From: XinSun Date: Fri, 21 Aug 2020 05:44:56 +0800 Subject: [PATCH] HBASE-24914 Remove duplicate code appearing continuously in method ReplicationPeerManager.updatePeerConfig (#2287) Signed-off-by: Jan Hentschel --- .../hadoop/hbase/master/replication/ReplicationPeerManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java index 52060aeb36c..8a5733fc6c7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java @@ -279,8 +279,6 @@ public class ReplicationPeerManager { // we need to use the new conf to overwrite the old one. newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration()); newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration()); - newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration()); - newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration()); ReplicationPeerConfig newPeerConfig = newPeerConfigBuilder.build(); peerStorage.updatePeerConfig(peerId, newPeerConfig); peers.put(peerId, new ReplicationPeerDescription(peerId, desc.isEnabled(), newPeerConfig,