From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 10 Nov 2011 20:10:42 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~136
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=dbdbd482ead909120dc3c4e4b6e41413b7fa57a1;hp=b551a063b85ebdf0accaf2bbe06d0231a7b50f23

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 16dd9ab5d..5755363c8 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1057,6 +1057,12 @@ static void *thread_manage_apps(void *data)
 						goto error;
 					}
 
+					/*
+					 * Add channel(s) and event(s) to newly registered apps
+					 * from lttng global UST domain.
+					 */
+					update_ust_app(ust_cmd.sock);
+
 					ret = ustctl_register_done(ust_cmd.sock);
 					if (ret < 0) {
 						/*
@@ -1078,11 +1084,6 @@ static void *thread_manage_apps(void *data)
 								ust_cmd.sock);
 					}
 
-					/*
-					 * Add channel(s) and event(s) to newly registered apps
-					 * from lttng global UST domain.
-					 */
-					update_ust_app(ust_cmd.sock);
 					break;
 				}
 			} else {