From e22d74310bc57c0252f4a00a6b8634b0a9ed92aa Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sat, 30 Jul 2022 10:31:17 -0700
Subject: [PATCH] RTEMS: ensure epicsThreadMustJoin() short-circuits

---
 modules/libcom/src/osi/os/RTEMS-score/osdThread.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/libcom/src/osi/os/RTEMS-score/osdThread.c b/modules/libcom/src/osi/os/RTEMS-score/osdThread.c
index ac157f445..110951445 100644
--- a/modules/libcom/src/osi/os/RTEMS-score/osdThread.c
+++ b/modules/libcom/src/osi/os/RTEMS-score/osdThread.c
@@ -371,6 +371,9 @@ void epicsThreadMustJoin(epicsThreadId id)
     rtems_id target_tid = (rtems_id)id, self_tid;
     struct taskVar *v = 0;
 
+    if(!id)
+        return;
+
     rtems_task_ident (RTEMS_SELF, 0, &self_tid);
 
     {