Initialize sources at binding start.

This has changed and is now explicitly launched because
last step of Controller configuration doesn't execute it.

Change-Id: I104011b912172da62114b62eeab90c76e41459dd
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

1 files changed, 14 insertions, 3 deletions

diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp
index c83aee6..0ee210b 100644
--- a/signal-composer-binding/signal-composer.cpp
+++ b/signal-composer-binding/signal-composer.cpp
@@ -295,7 +295,7 @@ int Composer::loadOneSourceAPI(json_object* sourceJ)
 
 	onReceivedCtl = onReceivedJ ? convert2Action("onReceived", onReceivedJ) : nullptr;
 
-	sourcesListV_.push_back(std::make_shared<SourceAPI>(uid, api, info, initCtl, getSignalsCtl, onReceivedCtl, retention));
+	newSourcesListV_.push_back(std::make_shared<SourceAPI>(uid, api, info, initCtl, getSignalsCtl, onReceivedCtl, retention));
 	return err;
 }
 
@@ -421,7 +421,17 @@ int Composer::loadOneSignal(json_object* signalJ)
 			}
 			dependsV.push_back(sourceStr);
 		}
-		if(!src) {src=*sourcesListV_.rbegin();}
+		if(!src) {
+			if (!sourcesListV_.empty())
+				src = *sourcesListV_.rbegin();
+			else if (!newSourcesListV_.empty())
+				src = *newSourcesListV_.rbegin();
+			else
+			{
+				AFB_WARNING("Signal '%s' not correctly attached to its source. Abort this one", json_object_to_json_string(signalJ));
+				return -1;
+			}
+		}
 	}
 
 	// Set default retention if not specified
@@ -644,7 +654,8 @@ CtlConfigT* Composer::ctlConfig()
 
 void Composer::initSourcesAPI()
 {
-	for(int i=0; i < newSourcesListV_.size(); i++)
+	size_t toInitialize = newSourcesListV_.size();
+	for(int i=0; i < toInitialize; i++)
 	{
 		std::shared_ptr<SourceAPI> src = newSourcesListV_.back();
 		newSourcesListV_.pop_back();