Merge pull request #1164 from alvasw/tor_fix

Fix multiple TorService creations

network/network/src/main/java/bisq/network/p2p/node/transport/TorTransport.java

@@ -23,10 +23,12 @@
 public class TorTransport implements Transport {
     public final static int DEFAULT_PORT = 9999;
 
-    private final TorService torService;
+    private static TorService torService;
 
     public TorTransport(TransportConfig config) {
-        torService = new TorService((TorTransportConfig) config);
+        if (torService == null) {
+            torService = new TorService((TorTransportConfig) config);
+        }
     }
 
     @Override

network/tor/tor/src/main/java/bisq/tor/TorService.java

@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 @Slf4j
 public class TorService implements Service {
@@ -49,6 +50,8 @@ public class TorService implements Service {
     private final NativeTorController nativeTorController = new NativeTorController();
     private final OnionServicePublishService onionServicePublishService;
 
+    private final AtomicBoolean isRunning = new AtomicBoolean();
+
     private Optional<NativeTorProcess> torProcess = Optional.empty();
     private Optional<Integer> socksPort = Optional.empty();
     private Optional<TorSocksProxyFactory> torSocksProxyFactory = Optional.empty();
@@ -61,6 +64,11 @@ public TorService(TorTransportConfig transportConfig) {
 
     @Override
     public CompletableFuture<Boolean> initialize() {
+        boolean isAlreadyRunning = isRunning.getAndSet(true);
+        if (isAlreadyRunning) {
+            return CompletableFuture.completedFuture(true);
+        }
+
         installTorIfNotUpToDate();
 
         int controlPort = NetworkUtils.findFreeSystemPort();