X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fjul-thread.c;h=4a6fc2a849ed2f777daebd85fe56ba87a2d845cb;hb=ec4c7666d3907424f62e874b78e44ce4b9456f41;hp=a683cdcdbc4756b632ab6c042db474f1c2993b57;hpb=e37c37c64ff100d236ecc0436c802e5917880ca1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/jul-thread.c b/src/bin/lttng-sessiond/jul-thread.c
index a683cdcdb..4a6fc2a84 100644
--- a/src/bin/lttng-sessiond/jul-thread.c
+++ b/src/bin/lttng-sessiond/jul-thread.c
@@ -282,12 +282,13 @@ void *jul_thread_manage_registration(void *data)
 	}
 
 	while (1) {
-		DBG3("[jul-thread] Manage JUL polling on %d fds",
-				LTTNG_POLL_GETNB(&events));
+		DBG3("[jul-thread] Manage JUL polling");
 
 		/* Inifinite blocking call, waiting for transmission */
 restart:
 		ret = lttng_poll_wait(&events, -1);
+		DBG3("[jul-thread] Manage agent return from poll on %d fds",
+				LTTNG_POLL_GETNB(&events));
 		if (ret < 0) {
 			/*
 			 * Restart interrupted system call.
@@ -305,6 +306,11 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
+			if (!revents) {
+				/* No activity for this FD (poll implementation). */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = sessiond_check_thread_quit_pipe(pollfd, revents);
 			if (ret) {