From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 15 May 2017 15:16:45 +0000 (-0400)
Subject: Fix: missing check on notification thread join
X-Git-Tag: v2.11.0-rc1~581
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3dec304bd4560d03c0c7338727e82f8eba2f7cb3;p=lttng-tools.git

Fix: missing check on notification thread join

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index d9355b019..5a6741f2d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -6334,13 +6334,13 @@ exit_init_data:
 	if (notification_thread_handle) {
 		notification_thread_command_quit(notification_thread_handle);
 		notification_thread_handle_destroy(notification_thread_handle);
-	}
 
-	ret = pthread_join(notification_thread, &status);
-	if (ret) {
-		errno = ret;
-		PERROR("pthread_join notification thread");
-		retval = -1;
+		ret = pthread_join(notification_thread, &status);
+		if (ret) {
+			errno = ret;
+			PERROR("pthread_join notification thread");
+			retval = -1;
+		}
 	}
 
 	rcu_thread_offline();