celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [celix] branch develop updated: Fixes an issue with C++ properties using std::string and being assigned nullptr values.
Date Wed, 11 Sep 2019 18:05:48 GMT
This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new f16b64e  Fixes an issue with C++ properties using std::string and being assigned
nullptr values.
f16b64e is described below

commit f16b64ee43797e3618925b02616426bfc549f1dd
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
AuthorDate: Wed Sep 11 20:05:23 2019 +0200

    Fixes an issue with C++ properties using std::string and being assigned nullptr values.
---
 libs/framework/include/celix/dm/ServiceDependency_Impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/framework/include/celix/dm/ServiceDependency_Impl.h b/libs/framework/include/celix/dm/ServiceDependency_Impl.h
index a33a4ce..846e0c0 100644
--- a/libs/framework/include/celix/dm/ServiceDependency_Impl.h
+++ b/libs/framework/include/celix/dm/ServiceDependency_Impl.h
@@ -400,7 +400,7 @@ int ServiceDependency<T,I>::invokeCallback(std::function<void(I*,
Properties&&)>
             hash_map_iterator_t iter = hashMapIterator_construct((hash_map_pt)props);
             while(hashMapIterator_hasNext(&iter)) {
                 key = (const char*) hashMapIterator_nextKey(&iter);
-                value = celix_properties_get(props, key, NULL);
+                value = celix_properties_get(props, key, "");
                 //std::cout << "got property " << key << "=" << value
<< "\n";
                 properties[key] = value;
             }


Mime
View raw message