From 25efcf878276909ea597220aa1988b83709d564a Mon Sep 17 00:00:00 2001
From: Marcus Winter <marcus.winter.ext@siemens.com>
Date: Tue, 8 Mar 2016 09:29:53 +0100
Subject: [PATCH] base_c: removed double code introduced by automerge

---
 base_c/src/thread.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base_c/src/thread.c b/base_c/src/thread.c
index 1388075..784276f 100644
--- a/base_c/src/thread.c
+++ b/base_c/src/thread.c
@@ -279,7 +279,6 @@ int embb_thread_join(embb_thread_t* thread, int *result_code) {
     return EMBB_ERROR;
   }
   int status = 0;
-  if (thread == NULL) return EMBB_ERROR;
   status = pthread_join(thread->embb_internal_handle, NULL);
   if (thread->embb_internal_arg != NULL) {
     if (result_code != NULL) {
--
libgit2 0.26.0