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 2016/10/16 21:48:59 UTC

[2/2] celix git commit: CELIX-282: Updates changes and fixes error in documentation

CELIX-282: Updates changes and fixes error in documentation


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/147a3077
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/147a3077
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/147a3077

Branch: refs/heads/develop
Commit: 147a3077516ff87c3f794d1a28f2fc10674dc2c1
Parents: 1cf7f22
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Sun Oct 16 23:52:48 2016 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Sun Oct 16 23:52:48 2016 +0200

----------------------------------------------------------------------
 CHANGES                                            | 2 ++
 documents/getting_started/using_services_with_c.md | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/147a3077/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 387795f..2d8ff39 100644
--- a/CHANGES
+++ b/CHANGES
@@ -210,4 +210,6 @@ Changes for 2.0.0
     [CELIX-377] wrong rpath setup in CMake files
     [CELIX-378] Travis build errors on Max OSX
     [CELIX-379] Extend cmake fucntion add_deploy with an option to specify the launcher
+    [CELIX-376] serviceRegistration sometimes paired to invalidated serviceReference
     [CELIX-380] PROPERTIES_FOR_EACH macro does not iterate over all keys
+    [CELIX-381] Invoke set for dependency manager called before suspending the component

http://git-wip-us.apache.org/repos/asf/celix/blob/147a3077/documents/getting_started/using_services_with_c.md
----------------------------------------------------------------------
diff --git a/documents/getting_started/using_services_with_c.md b/documents/getting_started/using_services_with_c.md
index 45f60bb..9934fa5 100644
--- a/documents/getting_started/using_services_with_c.md
+++ b/documents/getting_started/using_services_with_c.md
@@ -560,7 +560,7 @@ celix_status_t dm_init(void *userData, bundle_context_pt context, dm_dependency_
  	service because after removal of the service the memory location of that service
 	could be freed
 	*/
-    serviceDependency_setCallbacksSafe(dep, foo2_t*, const example_t*, NULL, foo2_addExample, foo2_removeExample, NULL, NULL);
+    serviceDependency_setCallbacksSafe(dep, foo2_t*, const example_t*, NULL, foo2_addExample, NULL, foo2_removeExample, NULL);
 	component_addServiceDependency(cmp, dep);
 
 	dependencyManager_add(manager, cmp);