From c000d38a095d5cf020980528e8361b5a8d8e72fd Mon Sep 17 00:00:00 2001
From: HenrikJannsen <boilingfrog@gmx.com>
Date: Tue, 13 Dec 2022 18:11:49 -0500
Subject: [PATCH] Remove unnecessary thread and try/catch. Wrap
 nodeAddressProperty.set into UserThread.execute as it is a javafx api. We
 call startServer also in that execute scope to maintain order of calls.

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
---
 .../network/p2p/network/TorNetworkNode.java   | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
index e396278472..ce6a9f9a80 100644
--- a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
+++ b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
@@ -195,28 +195,16 @@ public class TorNetworkNode extends NetworkNode {
                 nodeAddressProperty.set(new NodeAddress(hiddenServiceSocket.getServiceName() + ":" + hiddenServiceSocket.getHiddenServicePort()));
                 UserThread.execute(() -> setupListeners.forEach(SetupListener::onTorNodeReady));
                 hiddenServiceSocket.addReadyListener(socket -> {
-                    try {
-                        log.info("\n################################################################\n" +
-                                        "Tor hidden service published after {} ms. Socket={}\n" +
-                                        "################################################################",
-                                System.currentTimeMillis() - ts, socket);
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                try {
-                                    nodeAddressProperty.set(new NodeAddress(hiddenServiceSocket.getServiceName() + ":" + hiddenServiceSocket.getHiddenServicePort()));
-                                    startServer(socket);
-                                    UserThread.execute(() -> setupListeners.forEach(SetupListener::onHiddenServicePublished));
-                                } catch (final Exception e1) {
-                                    log.error(e1.toString());
-                                    e1.printStackTrace();
-                                }
-                            }
-                        }.start();
-                    } catch (final Exception e) {
-                        log.error(e.toString());
-                        e.printStackTrace();
-                    }
+                    log.info("\n################################################################\n" +
+                                    "Tor hidden service published after {} ms. Socket={}\n" +
+                                    "################################################################",
+                            System.currentTimeMillis() - ts, socket);
+
+                    UserThread.execute(() -> {
+                        nodeAddressProperty.set(new NodeAddress(hiddenServiceSocket.getServiceName() + ":" + hiddenServiceSocket.getHiddenServicePort()));
+                        startServer(socket);
+                        setupListeners.forEach(SetupListener::onHiddenServicePublished);
+                    });
                     return null;
                 });
             } catch (TorCtlException e) {