boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-23 12:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ignore error sending message after shut down

Browse source
This commit is contained in:
woodser 2023-12-29 10:28:45 -05:00
parent 342c212ba8
commit e2e2963b99
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/java/haveno/common/UserThread.java
View file

@ -58,7 +58,7 @@ public class UserThread {
} }
public static void execute(Runnable command) { public static void execute(Runnable command) {
UserThread.executor.execute(() -> { executor.execute(() -> {
Thread.currentThread().setName(USER_THREAD_NAME); Thread.currentThread().setName(USER_THREAD_NAME);
command.run(); command.run();
}); });
@ -79,7 +79,8 @@ public class UserThread {
} }
} }
public static boolean isUserThread(Thread thread) { // TODO: better way to determine if on UserThread, since this is not reliable
private static boolean isUserThread(Thread thread) {
return USER_THREAD_NAME.equals(thread.getName()); return USER_THREAD_NAME.equals(thread.getName());
} }

20
p2p/src/main/java/haveno/network/p2p/network/NetworkNode.java
View file

@ -306,27 +306,25 @@ public abstract class NetworkNode implements MessageListener {
} }
public void onFailure(@NotNull Throwable throwable) { public void onFailure(@NotNull Throwable throwable) {
UserThread.execute(() -> { UserThread.execute(() -> resolveWithException(resultFuture, throwable));
if (!resultFuture.setException(throwable)) {
// In case the setException returns false we need to cancel the future.
resultFuture.cancel(true);
}
});
} }
}, MoreExecutors.directExecutor()); }, MoreExecutors.directExecutor());
} catch (RejectedExecutionException exception) { } catch (RejectedExecutionException exception) {
if (!executor.isShutdown()) {
log.error("RejectedExecutionException at sendMessage: ", exception); log.error("RejectedExecutionException at sendMessage: ", exception);
UserThread.execute(() -> { UserThread.execute(() -> resolveWithException(resultFuture, exception));
if (!resultFuture.setException(exception)) {
// In case the setException returns false we need to cancel the future.
resultFuture.cancel(true);
} }
});
} }
return resultFuture; return resultFuture;
} }
private void resolveWithException(SettableFuture<?> future, Throwable exception) {
if (!future.setException(exception)) {
future.cancel(true); // In case the setException returns false we need to cancel the future.
}
}
public ReadOnlyObjectProperty<NodeAddress> nodeAddressProperty() { public ReadOnlyObjectProperty<NodeAddress> nodeAddressProperty() {
return nodeAddressProperty; return nodeAddressProperty;
} }