Merge pull request #4994 from 317787106/hotfix/fastforward

317787106 · web-flow · commit 2a7f5aabf282 · 2023-02-16T11:41:45.000+08:00
fix(net): optimize activeNodes node adding logic
diff --git a/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java b/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java
@@ -171,8 +171,11 @@ private boolean isActiveWitness() {
   }
 
   private void connect() {
-    fastForwardNodes.forEach(address ->
-            TronNetService.getP2pConfig().getActiveNodes().add(address));
+    for (InetSocketAddress fastForwardNode : fastForwardNodes) {
+      if (!TronNetService.getP2pConfig().getActiveNodes().contains(fastForwardNode)) {
+        TronNetService.getP2pConfig().getActiveNodes().add(fastForwardNode);
+      }
+    }
   }
 
   private void disconnect() {

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,11 @@ private boolean isActiveWitness() {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`private void connect() {`
`174`		`- fastForwardNodes.forEach(address ->`
`175`		`- TronNetService.getP2pConfig().getActiveNodes().add(address));`
	`174`	`+ for (InetSocketAddress fastForwardNode : fastForwardNodes) {`
	`175`	`+ if (!TronNetService.getP2pConfig().getActiveNodes().contains(fastForwardNode)) {`
	`176`	`+ TronNetService.getP2pConfig().getActiveNodes().add(fastForwardNode);`
	`177`	`+ }`
	`178`	`+ }`
`176`	`179`	`}`
`177`	`180`
`178`	`181`	`private void disconnect() {`