celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erjanalt...@apache.org
Subject celix git commit: Fixed cleanup admin
Date Thu, 08 Feb 2018 18:12:01 GMT
Repository: celix
Updated Branches:
  refs/heads/develop af26af6b7 -> cf294f3c0


Fixed cleanup admin


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

Branch: refs/heads/develop
Commit: cf294f3c0a57a667fe7d71b83f7141149e4c5029
Parents: af26af6
Author: Erjan Altena <erjanaltena@gmail.com>
Authored: Thu Feb 8 19:11:49 2018 +0100
Committer: Erjan Altena <erjanaltena@gmail.com>
Committed: Thu Feb 8 19:11:49 2018 +0100

----------------------------------------------------------------------
 pubsub/pubsub_admin_zmq/src/psa_activator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/cf294f3c/pubsub/pubsub_admin_zmq/src/psa_activator.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_zmq/src/psa_activator.c b/pubsub/pubsub_admin_zmq/src/psa_activator.c
index 687e909..008dff5 100644
--- a/pubsub/pubsub_admin_zmq/src/psa_activator.c
+++ b/pubsub/pubsub_admin_zmq/src/psa_activator.c
@@ -159,6 +159,8 @@ celix_status_t bundleActivator_stop(void * userData, bundle_context_pt
context)
 	struct activator *activator = userData;
 
 	status += serviceTracker_close(activator->serializerTracker);
+	serviceRegistration_unregister(activator->admin->shellCmdReg);
+	activator->admin->shellCmdReg = NULL;
 	status += serviceRegistration_unregister(activator->registration);
 
 	activator->registration = NULL;
@@ -176,7 +178,6 @@ celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt
contex
 	serviceTracker_destroy(activator->serializerTracker);
 	pubsubAdmin_destroy(activator->admin);
 	activator->admin = NULL;
-    serviceRegistration_unregister(activator->admin->shellCmdReg);
 	free(activator);
 
 	return status;


Mime
View raw message