From 648022e116423690c634eb5f79e310f326a3be78 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sat, 1 Jan 2022 23:55:24 -0800
Subject: [PATCH] take care when setting descriptor to avoid NPE
---
.../moves/dis7/utilities/DisThreadedNetworkInterface.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
index 5a8d999dfd..085a705866 100644
--- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
+++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
@@ -818,10 +818,11 @@ public class DisThreadedNetworkInterface
*/
public void setDescriptor(String newDescriptor)
{
- this.descriptor = newDescriptor;
- TRACE_PREFIX = "[" + (DisThreadedNetworkInterface.class.getSimpleName() + " " + descriptor).trim() + "] ";
+ if (newDescriptor != null)
+ this.descriptor = newDescriptor.trim();
+ TRACE_PREFIX = "[" + DisThreadedNetworkInterface.class.getSimpleName() + " " + descriptor + "] ";
}
-
+ /** Self test to check basic operation, invoked by main() */
private void selfTest()
{
System.out.println(TRACE_PREFIX + "main() self test initialized...");
--
GitLab