celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [18/38] celix git commit: CELIX-272: Fix missing unregister service for shell
Date Tue, 17 Nov 2015 11:57:35 GMT
CELIX-272: Fix missing unregister service for shell


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

Branch: refs/heads/develop
Commit: a6213e45525e0d69c7c6cb736769f781a244911f
Parents: 90b92ff
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 16 12:20:23 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 16 12:20:23 2015 +0100

----------------------------------------------------------------------
 shell/private/src/activator.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/a6213e45/shell/private/src/activator.c
----------------------------------------------------------------------
diff --git a/shell/private/src/activator.c b/shell/private/src/activator.c
index 7cb2946..19f9a17 100644
--- a/shell/private/src/activator.c
+++ b/shell/private/src/activator.c
@@ -266,13 +266,11 @@ celix_status_t bundleActivator_destroy(void *_ptr, bundle_context_pt
__attribute
     if (instance_ptr) {
         for (unsigned int i = 0; instance_ptr->std_commands[i].exec != NULL; i++) {
             free(instance_ptr->std_commands[i].service);
-
-            if (instance_ptr->std_commands[i].props != NULL) {
-                properties_destroy(instance_ptr->std_commands[i].props);
-            }
         }
     }
 
+    serviceRegistration_unregister(instance_ptr->registration);
+
     shell_destroy(&instance_ptr->shellService);
 
     free(instance_ptr);


Mime
View raw message