celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [12/21] celix git commit: Merge branch 'develop' into feature/CELIX-272_synchronization_service_registry
Date Mon, 16 Nov 2015 20:17:26 GMT
Merge branch 'develop' into feature/CELIX-272_synchronization_service_registry


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

Branch: refs/heads/feature/CELIX-272_synchronization_service_registry
Commit: 8c02ecf382b529af57509188e380768f2817b20b
Parents: eae936a 437da02
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 16 16:43:07 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 16 16:43:07 2015 +0100

----------------------------------------------------------------------
 .travis.yml                                     |   2 +-
 log_service/public/src/log_helper.c             |   4 +-
 .../private/include/endpoint_discovery_server.h |   2 +-
 .../private/src/endpoint_discovery_poller.c     |   2 -
 remote_services/discovery_shm/CMakeLists.txt    |   4 +-
 .../private/include/discovery_impl.h            |   2 +-
 .../private/include/discovery_shm.h             |  56 +++
 .../private/include/discovery_shmWatcher.h      |  40 +++
 .../discovery_shm/private/include/shm.h         |  56 ---
 .../discovery_shm/private/include/shm_watcher.h |  40 ---
 .../discovery_shm/private/src/discovery_impl.c  |  81 ++---
 .../discovery_shm/private/src/discovery_shm.c   | 279 +++++++++++++++
 .../private/src/discovery_shmWatcher.c          | 249 +++++++++++++
 remote_services/discovery_shm/private/src/shm.c | 264 --------------
 .../discovery_shm/private/src/shm_watcher.c     | 230 ------------
 .../dynamic_function_interface/CMakeLists.txt   |   2 +-
 .../private/test/rsa_client_server_tests.cpp    | 351 ++++++++++++++++---
 .../remote_service_admin_shm/CMakeLists.txt     |   7 +
 .../src/remote_service_admin_activator.c        | 114 +++---
 .../private/src/remote_service_admin_impl.c     | 199 ++++++-----
 .../private/test/CMakeLists.txt                 |  58 +++
 .../private/test/client.properties.in           |  25 ++
 .../private/test/rsa_client_server_tests.cpp    | 126 +++++++
 .../private/test/run_tests.cpp                  |  24 ++
 .../private/test/server.properties.in           |  25 ++
 .../private/src/topology_manager.c              |   8 +-
 shell/private/src/activator.c                   |   2 +
 shell/private/src/shell.c                       |   3 +
 28 files changed, 1405 insertions(+), 850 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8c02ecf3/shell/private/src/activator.c
----------------------------------------------------------------------
diff --cc shell/private/src/activator.c
index 19f9a17,aed0d9b..edd2931
--- a/shell/private/src/activator.c
+++ b/shell/private/src/activator.c
@@@ -269,10 -269,14 +269,12 @@@ celix_status_t bundleActivator_destroy(
          }
      }
  
 +    serviceRegistration_unregister(instance_ptr->registration);
 +
      shell_destroy(&instance_ptr->shellService);
  
+     free(instance_ptr->listener);
+ 
      free(instance_ptr);
  
  	return CELIX_SUCCESS;

http://git-wip-us.apache.org/repos/asf/celix/blob/8c02ecf3/shell/private/src/shell.c
----------------------------------------------------------------------


Mime
View raw message