X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=6ccd1fe04abfdc54e3c84aa6e80ceb4edf58c096;hp=f7dd90cbe0aec976925dd0215af89d8b81648b10;hb=7ca172c15891d4ff3f711dcc05f991fd2c094bc7;hpb=4655b864b310dca6b4346770351a0e6a261ba5a1

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index f7dd90cbe..6ccd1fe04 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2146,10 +2146,6 @@ error_free_ht_element:
 	free(trigger_ht_element);
 error:
 	if (free_trigger) {
-		struct lttng_action *action = lttng_trigger_get_action(trigger);
-
-		lttng_condition_destroy(condition);
-		lttng_action_destroy(action);
 		lttng_trigger_destroy(trigger);
 	}
 	rcu_read_unlock();
@@ -2184,7 +2180,6 @@ int handle_notification_thread_command_unregister_trigger(
 	struct lttng_trigger_ht_element *trigger_ht_element = NULL;
 	struct lttng_condition *condition = lttng_trigger_get_condition(
 			trigger);
-	struct lttng_action *action;
 	enum lttng_error_code cmd_reply;
 
 	rcu_read_lock();
@@ -2246,10 +2241,7 @@ int handle_notification_thread_command_unregister_trigger(
 			struct lttng_trigger_ht_element, node);
 	cds_lfht_del(state->triggers_ht, triggers_ht_node);
 
-	condition = lttng_trigger_get_condition(trigger_ht_element->trigger);
-	lttng_condition_destroy(condition);
-	action = lttng_trigger_get_action(trigger_ht_element->trigger);
-	lttng_action_destroy(action);
+	/* Release the ownership of the trigger. */
 	lttng_trigger_destroy(trigger_ht_element->trigger);
 	call_rcu(&trigger_ht_element->rcu_node, free_lttng_trigger_ht_element_rcu);
 end: