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 2015/07/04 13:20:58 UTC
[06/16] celix git commit: Merge branch 'master' into develop
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/de21ef06
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/de21ef06
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/de21ef06
Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: de21ef06f20df73aff1b412d09fdd583e292f9e4
Parents: 3acf970 b2622ec
Author: Bjoern Petri <bp...@apache.org>
Authored: Sat Jun 13 11:55:28 2015 +0200
Committer: Bjoern Petri <bp...@apache.org>
Committed: Sat Jun 13 11:55:28 2015 +0200
----------------------------------------------------------------------
framework/private/include/framework_private.h | 4 +-
framework/private/src/framework.c | 97 +-
.../discovery/private/src/discovery_activator.c | 184 ++--
.../private/include/topology_manager.h | 5 +
.../topology_manager/private/src/activator.c | 295 +++---
.../private/src/topology_manager.c | 920 ++++++++++---------
6 files changed, 836 insertions(+), 669 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/de21ef06/framework/private/include/framework_private.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/de21ef06/framework/private/src/framework.c
----------------------------------------------------------------------
diff --cc framework/private/src/framework.c
index a75bed3,3032396..3f49cdc
--- a/framework/private/src/framework.c
+++ b/framework/private/src/framework.c
@@@ -204,11 -200,10 +204,12 @@@ celix_status_t framework_create(framewo
status = CELIX_DO_IF(status, celixThreadMutex_create(&(*framework)->bundleLock, NULL));
status = CELIX_DO_IF(status, celixThreadMutex_create(&(*framework)->installRequestLock, NULL));
status = CELIX_DO_IF(status, celixThreadMutex_create(&(*framework)->dispatcherLock, NULL));
+ status = CELIX_DO_IF(status, celixThreadMutex_create(&(*framework)->bundleListenerLock, NULL));
status = CELIX_DO_IF(status, celixThreadCondition_init(&(*framework)->dispatcher, NULL));
if (status == CELIX_SUCCESS) {
+#ifdef WITH_APR
(*framework)->pool = pool;
+#endif
(*framework)->bundle = NULL;
(*framework)->installedBundleMap = NULL;
(*framework)->registry = NULL;