From 63081a1f1474dcd2ad6d058164428e812d6a1788 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:34:15 -0500 Subject: [PATCH] fix npe with xmrNodes with onion address --- core/src/main/java/haveno/core/api/XmrLocalNode.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/haveno/core/api/XmrLocalNode.java b/core/src/main/java/haveno/core/api/XmrLocalNode.java index 583ae8b390..7295202c64 100644 --- a/core/src/main/java/haveno/core/api/XmrLocalNode.java +++ b/core/src/main/java/haveno/core/api/XmrLocalNode.java @@ -112,8 +112,7 @@ public class XmrLocalNode { // determine if local node is configured boolean hasConfiguredLocalNode = false; for (XmrNode node : xmrNodes.selectPreferredNodes(new XmrNodesSetupPreferences(preferences))) { - String prefix = node.getAddress().startsWith("http") ? "" : "http://"; - if (equalsUri(prefix + node.getAddress() + ":" + node.getPort())) { + if (node.getAddress() != null && equalsUri("http://" + node.getAddress() + ":" + node.getPort())) { hasConfiguredLocalNode = true; break; } @@ -139,7 +138,11 @@ public class XmrLocalNode { } public boolean equalsUri(String uri) { - return HavenoUtils.isLocalHost(uri) && MoneroUtils.parseUri(uri).getPort() == HavenoUtils.getDefaultMoneroPort(); + try { + return HavenoUtils.isLocalHost(uri) && MoneroUtils.parseUri(uri).getPort() == HavenoUtils.getDefaultMoneroPort(); + } catch (Exception e) { + return false; + } } /**