X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=dcae248b4088c5aa068b871afbc37871176f532b;hp=e6b9b6a1e72790702a7d96e1412dd3bcadc43662;hb=ad9f5c17782ec9d5fe735bcb0f3d7b52199f8feb;hpb=d73ee93f00ad2bf67dc79f2e3e09f74e2fb3d01f

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index e6b9b6a1e..dcae248b4 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -433,7 +433,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
 
 	DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
 			session->id);
-	ret = relay_rotate_pending(session, session->rotate_count - 1);
+	ret = relay_rotate_pending(session, session->current_archive_id - 1);
 	if (ret < 0) {
 		ERR("[rotation-thread] Check relay rotate pending");
 		goto end;
@@ -732,11 +732,6 @@ int handle_notification_channel(int fd, uint32_t revents,
 
 end:
 	lttng_notification_destroy(notification);
-	if (ret != 0) {
-		goto end;
-	}
-
-
 	return ret;
 }