From 905c14a8887059b82c1f1eb71401276807fddf74 Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@nps.edu> Date: Mon, 20 Dec 2021 22:05:05 -0800 Subject: [PATCH] avoid exception by not joining (closing) thread if already null --- .../moves/dis7/utilities/DisThreadedNetworkInterface.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java index eb82107eda..19ceeae77f 100644 --- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java +++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java @@ -537,8 +537,10 @@ public class DisThreadedNetworkInterface try { - senderThread.join(4000); // wait for thread to die, msec max duration - receiverThread.join(4000); // wait for thread to die, msec max duration + if (senderThread != null) + senderThread.join(4000); // wait for thread to die, msec max duration + if (receiverThread != null) + receiverThread.join(4000); // wait for thread to die, msec max duration senderThread = null; // make sure receiverThread = null; // make sure } -- GitLab