X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fiterator.c;h=bda2dfd3cfcd6f15558ac1a6631f6c710f4b9bc0;hb=df14f8afe4ec194b84a7c9e2fe1354951d6cca94;hp=1bfe3495051be8caa8d22d15b3532cceea794b65;hpb=beed0223d4bed1b12c89e5bb0491dfbe2eaf0859;p=babeltrace.git

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 1bfe3495..bda2dfd3 100644
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -349,6 +349,12 @@ void bt_notification_iterator_finalize(
 		break;
 	}
 
+	if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
+		iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
+	} else {
+		iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
+	}
+
 	assert(iterator->upstream_component);
 	comp_class = iterator->upstream_component->class;
 
@@ -380,12 +386,6 @@ void bt_notification_iterator_finalize(
 			bt_private_notification_iterator_from_notification_iterator(iterator));
 	}
 
-	if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
-		iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
-	} else {
-		iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
-	}
-
 	iterator->upstream_component = NULL;
 	iterator->upstream_port = NULL;
 }