celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [26/38] celix git commit: CELIX-272: Remove WITH_APR defines from framwork .. again
Date Tue, 17 Nov 2015 11:57:43 GMT
CELIX-272: Remove WITH_APR defines from framwork .. again


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

Branch: refs/heads/develop
Commit: c34e595bad77e222db94e0bac05090695c560ca7
Parents: a9edf1f
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 16 20:17:17 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 16 20:17:17 2015 +0100

----------------------------------------------------------------------
 framework/private/src/framework.c | 19 -------------------
 1 file changed, 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/c34e595b/framework/private/src/framework.c
----------------------------------------------------------------------
diff --git a/framework/private/src/framework.c b/framework/private/src/framework.c
index 25e2442..c3bc147 100644
--- a/framework/private/src/framework.c
+++ b/framework/private/src/framework.c
@@ -188,11 +188,7 @@ framework_logger_pt logger;
     #define fw_getLastError() dlerror()
 #endif
 
-#ifdef WITH_APR
-celix_status_t framework_create(framework_pt *framework, apr_pool_t *pool, properties_pt
config) {
-#else
 celix_status_t framework_create(framework_pt *framework, properties_pt config) {
-#endif
     celix_status_t status = CELIX_SUCCESS;
 
     logger = hashMap_get(config, "logger");
@@ -212,9 +208,6 @@ celix_status_t framework_create(framework_pt *framework, properties_pt
config) {
         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;
@@ -439,13 +432,7 @@ celix_status_t fw_init(framework_pt framework) {
     status = CELIX_DO_IF(status, celixThreadCondition_init(&framework->shutdownGate,
NULL));
 
     bundle_context_pt context = NULL;
-#ifdef WITH_APR
-    apr_pool_t *bundlePool = NULL;
-    apr_pool_create(&bundlePool, framework->pool);
-    status = CELIX_DO_IF(status, bundleContext_create(bundlePool, framework, framework->logger,
framework->bundle, &context));
-#else
     status = CELIX_DO_IF(status, bundleContext_create(framework, framework->logger, framework->bundle,
&context));
-#endif
     status = CELIX_DO_IF(status, bundle_setContext(framework->bundle, context));
     if (status == CELIX_SUCCESS) {
         activator_pt activator = NULL;
@@ -699,13 +686,7 @@ celix_status_t fw_startBundle(framework_pt framework, bundle_pt bundle,
int opti
                 name = NULL;
                 bundle_getCurrentModule(bundle, &module);
                 module_getSymbolicName(module, &name);
-#ifdef WITH_APR
-                apr_pool_t *bundlePool = NULL;
-                apr_pool_create(&bundlePool, framework->pool);
-                status = CELIX_DO_IF(status, bundleContext_create(bundlePool, framework,
framework->logger, bundle, &context));
-#else
                 status = CELIX_DO_IF(status, bundleContext_create(framework, framework->logger,
bundle, &context));
-#endif
                 status = CELIX_DO_IF(status, bundle_setContext(bundle, context));
 
                 if (status == CELIX_SUCCESS) {


Mime
View raw message