X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=82fd0ea074e0519c2c6bac47c146295e6c861053;hb=854382b8a0f18fa77ba97eac55a61dd8d8d8cc85;hp=fe2c8f4c8055b41048e6b9645ab7e2e2572f5c21;hpb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index fe2c8f4c8..82fd0ea07 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -192,6 +192,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_sess->id,
 			ua_sess->output_traces,
 			ua_sess->uid,
+			ua_chan->attr.blocking_timeout,
 			root_shm_path, shm_path);
 
 	health_code_update();
@@ -320,7 +321,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
 				DBG3("UST app consumer has no more stream available");
-				ret = 0;
 				break;
 			}
 			if (ret != -EPIPE) {