You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/05/07 14:47:57 UTC
[celix] branch feature/cxx_rsa_update updated (9e4ce6b -> 8fdcfc7)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch feature/cxx_rsa_update
in repository https://gitbox.apache.org/repos/asf/celix.git.
from 9e4ce6b Adds rapidjson lib install for github ci ubuntu configuration
add fc4425f Adds missing condition trigger for pubsub topology manager.
add d8556a9 Trying update to ubuntu 20.04 (from 18.04), because of dependency install issues.
add 61e19a5 Merge pull request #341 from apache/feature/small_pstm_fix
add f4e7a12 Trying update to ubuntu 20.04 (from 18.04), because of dependency install issues.
add 9caa3b3 Removes setting std=c++17 compiler option as INTERFACE on the promises lib.
add 000ed78 Merge pull request #342 from apache/hotfix/do_not_set_cxx_std
new 7297453 Merge branch 'master' into feature/cxx_rsa_update
new 8fdcfc7 Fixes iter loops with erase
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../admin/src/RemoteServiceAdmin.cc | 10 ++++++---
.../src/pubsub_topology_manager.c | 25 +++++++++++++++++++---
libs/promises/CMakeLists.txt | 2 +-
libs/promises/gtest/CMakeLists.txt | 1 +
4 files changed, 31 insertions(+), 7 deletions(-)
[celix] 01/02: Merge branch 'master' into feature/cxx_rsa_update
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx_rsa_update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 7297453ab4b525306f5ca579c2e7679a7da03add
Merge: 9e4ce6b 000ed78
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri May 7 16:33:45 2021 +0200
Merge branch 'master' into feature/cxx_rsa_update
.../src/pubsub_topology_manager.c | 25 +++++++++++++++++++---
libs/promises/CMakeLists.txt | 2 +-
libs/promises/gtest/CMakeLists.txt | 1 +
3 files changed, 24 insertions(+), 4 deletions(-)
[celix] 02/02: Fixes iter loops with erase
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx_rsa_update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 8fdcfc7381329dc9734d2d208268e32655cbf1c1
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri May 7 16:47:41 2021 +0200
Fixes iter loops with erase
---
bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc
index 4ed0e2f..9a1e09e 100644
--- a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc
+++ b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc
@@ -180,11 +180,13 @@ void celix::rsa::RemoteServiceAdmin::removeService(const std::shared_ptr<void>&
}
void celix::rsa::RemoteServiceAdmin::createImportServices() {
- for (auto it = _toBeImportedServices.begin(); it != _toBeImportedServices.end(); ++it) {
+ auto it = _toBeImportedServices.begin();
+ while (it != _toBeImportedServices.end()) {
auto interface = (*it)->getInterface();
auto existingFactory = _importServiceFactories.find(interface);
if (existingFactory == end(_importServiceFactories)) {
L_DEBUG("Adding endpoint to be imported but no factory available yet, delaying import");
+ it++;
continue;
}
auto endpointId = (*it)->getId();
@@ -195,18 +197,20 @@ void celix::rsa::RemoteServiceAdmin::createImportServices() {
}
void celix::rsa::RemoteServiceAdmin::createExportServices() {
-
- for (auto it = _toBeExportedServices.begin(); it != _toBeExportedServices.end(); ++it) {
+ auto it = _toBeExportedServices.begin();
+ while (it != _toBeExportedServices.end()) {
const auto& svcProperties = **it;
auto serviceName = svcProperties.get(celix::SERVICE_NAME, "");
auto svcId = svcProperties.getAsLong(celix::SERVICE_ID, -1);
if (serviceName.empty()) {
L_WARN("Adding service to be exported but missing objectclass for svc id %li", svcId);
+ it++;
continue;
}
auto factory = _exportServiceFactories.find(serviceName);
if (factory == end(_exportServiceFactories)) {
L_DEBUG("Adding service to be exported but no factory available yet, delaying creation");
+ it++;
continue;
}
_exportedServices.emplace(svcId, factory->second->exportService(svcProperties));