X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmanage-consumer.c;h=fa802adc91e33cd7e3ba92edfc1546a5f50b9016;hp=68c7d649b6d4ffff9fc2b59a40e2deda55385201;hb=ea6bf30f3684cf71633cb9f2c70ea0bc22b664c4;hpb=21fa020ee12d44632c5efde063869d542897bdd1

diff --git a/src/bin/lttng-sessiond/manage-consumer.c b/src/bin/lttng-sessiond/manage-consumer.c
index 68c7d649b..fa802adc9 100644
--- a/src/bin/lttng-sessiond/manage-consumer.c
+++ b/src/bin/lttng-sessiond/manage-consumer.c
@@ -134,11 +134,6 @@ void *thread_consumer_management(void *data)
 
 		health_code_update();
 
-		if (!revents) {
-			/* No activity for this FD (poll implementation). */
-			continue;
-		}
-
 		/* Thread quit pipe has been closed. Killing thread. */
 		if (pollfd == quit_pipe_read_fd) {
 			err = 0;
@@ -298,11 +293,6 @@ void *thread_consumer_management(void *data)
 
 			health_code_update();
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
 			/*
 			 * Thread quit pipe has been triggered, flag that we should stop
 			 * but continue the current loop to handle potential data from
@@ -471,7 +461,7 @@ bool launch_consumer_management_thread(struct consumer_data *consumer_data)
 	wait_until_thread_is_ready(notifiers);
 	lttng_thread_put(thread);
 	if (notifiers->initialization_result) {
-		goto error;
+		return false;
 	}
 	return true;
 error: