incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1547384 - in /incubator/celix/trunk: dependency_manager/private/src/ deployment_admin/private/src/ device_access/device_access/private/src/ device_access/driver_locator/private/src/ device_access/example/base_driver/private/src/ device_acc...
Date Tue, 03 Dec 2013 13:33:44 GMT
Author: abroekhuis
Date: Tue Dec  3 13:33:43 2013
New Revision: 1547384

URL: http://svn.apache.org/r1547384
Log:
Removed unused pool argument from arrayList_create and clone

Modified:
    incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c
    incubator/celix/trunk/dependency_manager/private/src/service_component.c
    incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
    incubator/celix/trunk/deployment_admin/private/src/deployment_package.c
    incubator/celix/trunk/deployment_admin/private/src/log_store.c
    incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
    incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
    incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c
    incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
    incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
    incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
    incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c
    incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c
    incubator/celix/trunk/framework/private/src/bundle.c
    incubator/celix/trunk/framework/private/src/bundle_cache.c
    incubator/celix/trunk/framework/private/src/filter.c
    incubator/celix/trunk/framework/private/src/framework.c
    incubator/celix/trunk/framework/private/src/module.c
    incubator/celix/trunk/framework/private/src/service_registration.c
    incubator/celix/trunk/framework/private/src/service_registry.c
    incubator/celix/trunk/framework/private/src/service_tracker.c
    incubator/celix/trunk/framework/private/test/bundle_context_test.cpp
    incubator/celix/trunk/framework/private/test/bundle_test.cpp
    incubator/celix/trunk/framework/private/test/service_reference_test.cpp
    incubator/celix/trunk/framework/private/test/service_registry_test.cpp
    incubator/celix/trunk/framework/private/test/service_tracker_test.cpp
    incubator/celix/trunk/launcher/private/src/launcher.c
    incubator/celix/trunk/log_service/private/src/log.c
    incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
    incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
    incubator/celix/trunk/remote_shell/private/src/remote_shell.c
    incubator/celix/trunk/shell/private/src/inspect_command.c
    incubator/celix/trunk/shell/private/src/shell.c
    incubator/celix/trunk/utils/private/src/array_list.c
    incubator/celix/trunk/utils/private/test/array_list_test.c
    incubator/celix/trunk/utils/private/test/array_list_test.cpp
    incubator/celix/trunk/utils/public/include/array_list.h

Modified: incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c Tue Dec  3 13:33:43 2013
@@ -33,13 +33,9 @@
 
 dependency_manager_pt dependencyManager_create(bundle_context_pt context) {
 	dependency_manager_pt manager = (dependency_manager_pt) malloc(sizeof(*manager));
-	apr_pool_t *pool = NULL;
-	apr_pool_t *npool = NULL;
-	bundleContext_getMemoryPool(context, &pool);
-	apr_pool_create(&npool, pool);
 	manager->context = context;
 	manager->services = NULL;
-	arrayList_create(npool, &manager->services);
+	arrayList_create(&manager->services);
 	return manager;
 }
 

Modified: incubator/celix/trunk/dependency_manager/private/src/service_component.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/service_component.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/service_component.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_component.c Tue Dec  3 13:33:43 2013
@@ -73,7 +73,7 @@ service_pt serviceComponent_create(bundl
         service->serviceName = NULL;
         service->serviceRegistration = NULL;
         service->dependencies = NULL;
-        arrayList_create(mypool, &service->dependencies);
+        arrayList_create(&service->dependencies);
 
         service->init = service_init;
         service->start= service_start;
@@ -82,7 +82,7 @@ service_pt serviceComponent_create(bundl
 
         service->context = context;
         service->manager = manager;
-        service->state = state_create(arrayList_clone(mypool, service->dependencies), false);
+        service->state = state_create(arrayList_clone(service->dependencies), false);
         service->executor = executor_create(mypool);
 
 		apr_thread_mutex_create(&service->mutex, APR_THREAD_MUTEX_UNNESTED, mypool);
@@ -126,7 +126,7 @@ service_pt serviceComponent_addServiceDe
 	}
 
 	apr_thread_mutex_lock(service->mutex);
-	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
+	new = state_create(arrayList_clone(service->dependencies), !state_isInactive(old));
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -147,7 +147,7 @@ service_pt serviceComponent_removeServic
 	}
 
 	apr_thread_mutex_lock(service->mutex);
-	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
+	new = state_create(arrayList_clone(service->dependencies), !state_isInactive(old));
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -160,7 +160,7 @@ void serviceComponent_dependencyAvailabl
 	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
-	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
+	new = state_create(arrayList_clone(service->dependencies), !state_isInactive(old));
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -186,7 +186,7 @@ void serviceComponent_dependencyUnavaila
 	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
-	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
+	new = state_create(arrayList_clone(service->dependencies), !state_isInactive(old));
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -202,7 +202,7 @@ void serviceComponent_start(service_pt s
 	bundleContext_registerService(service->context, SERVICE_COMPONENT_NAME, service, NULL, &service->serviceRegistration);
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
-	new = state_create(arrayList_clone(service->pool, service->dependencies), true);
+	new = state_create(arrayList_clone(service->dependencies), true);
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -213,7 +213,7 @@ void serviceComponent_stop(service_pt se
 	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
-	new = state_create(arrayList_clone(service->pool, service->dependencies), false);
+	new = state_create(arrayList_clone(service->dependencies), false);
 	service->state = new;
 	apr_thread_mutex_unlock(service->mutex);
 	serviceComponent_calculateStateChanges(service, old, new);
@@ -253,7 +253,7 @@ void serviceComponent_deactivateService(
 }
 
 void serviceComponent_startTrackingOptional(service_pt service, state_pt state) {
-    array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+    array_list_pt deps = arrayList_clone(state->dependencies);
 	array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
 		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
@@ -266,7 +266,7 @@ void serviceComponent_startTrackingOptio
 }
 
 void serviceComponent_stopTrackingOptional(service_pt service, state_pt state) {
-    array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+    array_list_pt deps = arrayList_clone(state->dependencies);
 	array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
 		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
@@ -280,7 +280,7 @@ void serviceComponent_stopTrackingOption
 
 void serviceComponent_startTrackingRequired(service_pt service, void * arg) {
 	state_pt state = (state_pt) arg;
-	array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+	array_list_pt deps = arrayList_clone(state->dependencies);
     array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
 		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
@@ -294,7 +294,7 @@ void serviceComponent_startTrackingRequi
 
 void serviceComponent_stopTrackingRequired(service_pt service, void * arg) {
 	state_pt state = (state_pt) arg;
-	array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+	array_list_pt deps = arrayList_clone(state->dependencies);
     array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
 		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);

Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Tue Dec  3 13:33:43 2013
@@ -222,7 +222,7 @@ size_t deploymentAdmin_parseVersions(voi
 
 celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, array_list_pt *versions) {
 	celix_status_t status = CELIX_SUCCESS;
-	arrayList_create(admin->pool, versions);
+	arrayList_create(versions);
 	CURL *curl;
 	CURLcode res;
 	curl = curl_easy_init();
@@ -381,12 +381,10 @@ celix_status_t deploymentAdmin_updateDep
 celix_status_t deploymentAdmin_startDeploymentPackageCustomizerBundles(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	apr_pool_t *tmpPool = NULL;
 	array_list_pt bundles = NULL;
 	array_list_pt sourceInfos = NULL;
 
-	apr_pool_create(&tmpPool, admin->pool);
-	arrayList_create(tmpPool, &bundles);
+	arrayList_create(&bundles);
 
 	deploymentPackage_getBundleInfos(source, &sourceInfos);
 	int i;
@@ -421,8 +419,6 @@ celix_status_t deploymentAdmin_startDepl
 		bundle_start(bundle);
 	}
 
-	apr_pool_destroy(tmpPool);
-
 	return status;
 }
 

Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_package.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_package.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_package.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_package.c Tue Dec  3 13:33:43 2013
@@ -55,9 +55,9 @@ celix_status_t deploymentPackage_create(
 		(*package)->resourceInfos = NULL;
 		(*package)->nameToBundleInfo = hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);
 		(*package)->pathToEntry = hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);
-		status = arrayList_create(pool, &(*package)->bundleInfos);
+		status = arrayList_create(&(*package)->bundleInfos);
 		if (status == CELIX_SUCCESS) {
-			status = arrayList_create(pool, &(*package)->resourceInfos);
+			status = arrayList_create(&(*package)->resourceInfos);
 			if (status == CELIX_SUCCESS) {
 				status = deploymentPackage_processEntries(*package);
 				if (status == CELIX_SUCCESS) {
@@ -84,7 +84,7 @@ celix_status_t deploymentPackage_getName
 }
 
 celix_status_t deploymentPackage_getBundleInfos(deployment_package_pt package, array_list_pt *infos) {
-	*infos = arrayList_clone(package->pool, package->bundleInfos);
+	*infos = arrayList_clone(package->bundleInfos);
 	return CELIX_SUCCESS;
 }
 
@@ -115,7 +115,7 @@ celix_status_t deploymentPackage_getBund
 }
 
 celix_status_t deploymentPackage_getResourceInfos(deployment_package_pt package, array_list_pt *infos) {
-	*infos = arrayList_clone(package->pool, package->resourceInfos);
+	*infos = arrayList_clone(package->resourceInfos);
 	return CELIX_SUCCESS;
 }
 

Modified: incubator/celix/trunk/deployment_admin/private/src/log_store.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/log_store.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/log_store.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/log_store.c Tue Dec  3 13:33:43 2013
@@ -52,7 +52,7 @@ celix_status_t logStore_create(apr_pool_
 	} else {
 		(*store)->pool = pool;
 		(*store)->storeId = 1;
-		arrayList_create(pool, &(*store)->logEvents);
+		arrayList_create(&(*store)->logEvents);
 	}
 
 	return status;

Modified: incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/device_manager.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/device_manager.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/device_manager.c Tue Dec  3 13:33:43 2013
@@ -70,7 +70,7 @@ celix_status_t deviceManager_create(apr_
 
 		(*manager)->devices = hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
 		(*manager)->drivers = hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
-		status = arrayList_create((*manager)->pool, &(*manager)->locators);
+		status = arrayList_create(&(*manager)->locators);
 	}
 
 	printf("DEVICE_MANAGER: Initialized\n");
@@ -154,9 +154,9 @@ static celix_status_t deviceManager_atta
 
 			hashMap_put(manager->devices, ref, service);
 
-			status = arrayList_create(attachPool, &included);
+			status = arrayList_create(&included);
 			if (status == CELIX_SUCCESS) {
-				status = arrayList_create(attachPool, &excluded);
+				status = arrayList_create(&excluded);
 				if (status == CELIX_SUCCESS) {
 					service_registration_pt registration = NULL;
 					status = serviceReference_getServiceRegistration(ref, &registration);
@@ -274,7 +274,7 @@ celix_status_t deviceManager_matchAttach
 								if (status == CELIX_SUCCESS) {
 									if (newDriverId != NULL) {
 										array_list_pt ids = NULL;
-										arrayList_create(attachPool, &ids);
+										arrayList_create(&ids);
 										arrayList_add(ids, newDriverId);
 										arrayList_add(excluded, finalAttributes);
 										status = deviceManager_matchAttachDriver(manager, attachPool, loader,
@@ -424,7 +424,7 @@ celix_status_t deviceManager_driverRemov
 celix_status_t deviceManager_getIdleDevices(device_manager_pt manager, apr_pool_t *pool, array_list_pt *idleDevices) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	status = arrayList_create(pool, idleDevices);
+	status = arrayList_create(idleDevices);
 	if (status == CELIX_SUCCESS) {
 		hash_map_iterator_pt iter = hashMapIterator_create(manager->devices);
 		while (hashMapIterator_hasNext(iter)) {
@@ -483,7 +483,7 @@ celix_status_t deviceManager_getIdleDevi
 celix_status_t deviceManager_getIdleDevices_exmaple(device_manager_pt manager, apr_pool_t *pool, array_list_pt *idleDevices) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	status = arrayList_create(pool, idleDevices);
+	status = arrayList_create(idleDevices);
 	if (status == CELIX_SUCCESS) {
 		hash_map_iterator_pt iter = hashMapIterator_create(manager->devices);
 		while (hashMapIterator_hasNext(iter)) {

Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c Tue Dec  3 13:33:43 2013
@@ -52,7 +52,7 @@ celix_status_t driverLoader_create(apr_p
 		(*loader)->context = context;
 		(*loader)->loadedDrivers = NULL;
 		(*loader)->pool = pool;
-		status = arrayList_create(pool, &(*loader)->loadedDrivers);
+		status = arrayList_create(&(*loader)->loadedDrivers);
 	}
 
 	return status;
@@ -66,7 +66,7 @@ apr_status_t driverLoader_destroy(void *
 
 celix_status_t driverLoader_findDrivers(driver_loader_pt loader, apr_pool_t *pool, array_list_pt locators, properties_pt properties, array_list_pt *driversIds) {
 	celix_status_t status = CELIX_SUCCESS;
-	arrayList_create(pool, driversIds);
+	arrayList_create(driversIds);
 
 	int i;
 	for (i = 0; i < arrayList_size(locators); i++) {
@@ -100,7 +100,7 @@ celix_status_t driverLoader_findDriversF
 
 celix_status_t driverLoader_loadDrivers(driver_loader_pt loader, apr_pool_t *pool, array_list_pt locators, array_list_pt driverIds, array_list_pt *references) {
 	celix_status_t status = CELIX_SUCCESS;
-	status = arrayList_create(pool, references);
+	status = arrayList_create(references);
 	if (status == CELIX_SUCCESS) {
 		int i;
 		for (i = 0; i < arrayList_size(driverIds); i++) {
@@ -129,7 +129,7 @@ celix_status_t driverLoader_loadDrivers(
 
 celix_status_t driverLoader_loadDriver(driver_loader_pt loader, apr_pool_t *pool, array_list_pt locators, char *driverId, array_list_pt *references) {
 	celix_status_t status = CELIX_SUCCESS;
-	status = arrayList_create(pool, references);
+	status = arrayList_create(references);
 	if (status == CELIX_SUCCESS) {
 		int i;
 		for (i = 0; i < arrayList_size(locators); i++) {
@@ -160,7 +160,7 @@ celix_status_t driverLoader_loadDriver(d
 
 celix_status_t driverLoader_loadDriverForLocator(driver_loader_pt loader, apr_pool_t *pool, driver_locator_service_pt locator, char *driverId, array_list_pt *references) {
 	celix_status_t status = CELIX_SUCCESS;
-	arrayList_create(loader->pool, references);
+	arrayList_create(references);
 
 	apr_pool_t *loadPool;
 	apr_status_t aprStatus = apr_pool_create(&loadPool, pool);

Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c Tue Dec  3 13:33:43 2013
@@ -70,7 +70,7 @@ celix_status_t driverMatcher_create(apr_
 		(*matcher)->context = context;
 		(*matcher)->attributes = hashMap_create(driverMatcher_matchKeyHash, NULL, driverMatcher_matchKeyEquals, NULL);
 
-		arrayList_create(pool, &(*matcher)->matches);
+		arrayList_create(&(*matcher)->matches);
 	}
 
 	return status;
@@ -125,7 +125,7 @@ celix_status_t driverMatcher_get(driver_
 
 	*attributes = hashMap_get(matcher->attributes, matchKeyS);
 	if (*attributes == NULL) {
-		arrayList_create(matcher->pool, attributes);
+		arrayList_create(attributes);
 		match_key_t matchKey = apr_palloc(matcher->pool, sizeof(*matchKey));
 		matchKey->matchValue = key;
 		hashMap_put(matcher->attributes, matchKey, *attributes);

Modified: incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/src/activator.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/src/activator.c Tue Dec  3 13:33:43 2013
@@ -73,7 +73,7 @@ celix_status_t bundleActivator_start(voi
         bi->service->locator = bi->locator;
         bi->locator->pool = pool;
         bi->locator->drivers = NULL;
-        arrayList_create(pool, &bi->locator->drivers);
+        arrayList_create(&bi->locator->drivers);
         bundleContext_getProperty(context, "DRIVER_LOCATOR_PATH", &bi->locator->path);
         if (bi->locator->path == NULL ) {
         	bi->locator->path = (char *)DEFAULT_LOCATOR_PATH;

Modified: incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c Tue Dec  3 13:33:43 2013
@@ -39,7 +39,7 @@ celix_status_t driverLocator_findDrivers
 
 	char *category = properties_get(props, DEVICE_CATEGORY);
 
-	status = arrayList_create(pool, drivers);
+	status = arrayList_create(drivers);
 	if (status == CELIX_SUCCESS) {
 		apr_pool_t *spool;
 		apr_status_t aprStatus = apr_pool_create(&spool, pool);

Modified: incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c Tue Dec  3 13:33:43 2013
@@ -54,7 +54,7 @@ celix_status_t bundleActivator_create(bu
 		if (instance != NULL) {
 			instance->context = context;
 			instance->pool = pool;
-			status = arrayList_create(pool, &instance->serviceRegistrations);
+			status = arrayList_create(&instance->serviceRegistrations);
 			if (status == CELIX_SUCCESS) {
 				(*userData) = instance;
 			}

Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c Tue Dec  3 13:33:43 2013
@@ -74,7 +74,7 @@ celix_status_t consumingDriver_create(bu
 		(*driver)->context=context;
 		(*driver)->references=NULL;
 
-		status = arrayList_create(pool, &(*driver)->references);
+		status = arrayList_create(&(*driver)->references);
 
 		apr_pool_pre_cleanup_register(pool, (*driver), consumingDriver_cleanup);
 	} else {

Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c Tue Dec  3 13:33:43 2013
@@ -89,7 +89,7 @@ celix_status_t refiningDriver_create(bun
 		(*driver)->deviceCount=0;
 		(*driver)->device = apr_palloc(driverPool, sizeof(*(*driver)->device));
 		(*driver)->devices=NULL;
-		status = arrayList_create(driverPool, &(*driver)->devices);
+		status = arrayList_create(&(*driver)->devices);
 	} else {
 		status = CELIX_ENOMEM;
 	}

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c Tue Dec  3 13:33:43 2013
@@ -72,7 +72,7 @@ celix_status_t bundleActivator_create(bu
 				activator->listener = NULL;
 				apr_thread_mutex_create(&activator->logServiceReferencesLock, 0, subpool);
 				activator->logServiceReferences = NULL;
-				arrayList_createWithEquals(subpool, ref_equals, &activator->logServiceReferences);
+				arrayList_createWithEquals(ref_equals, &activator->logServiceReferences);
 				activator->running = false;
 				activator->logger = NULL;
 			}

Modified: incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c Tue Dec  3 13:33:43 2013
@@ -88,7 +88,7 @@ celix_status_t bundleActivator_create(bu
     if (status == CELIX_SUCCESS) {
         *userData = apr_palloc(pool, sizeof(struct data));
         ((struct data *) (*userData))->publishers = NULL;
-        arrayList_create(pool, &((struct data *) (*userData))->publishers);
+        arrayList_create(&((struct data *) (*userData))->publishers);
     } else {
         status = CELIX_START_ERROR;
     }

Modified: incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c Tue Dec  3 13:33:43 2013
@@ -36,10 +36,8 @@
 
 void * dm_create(bundle_context_pt context) {
 	struct data * data = malloc(sizeof(*data));
-	apr_pool_t *pool = NULL;
-	bundleContext_getMemoryPool(context, &pool);
 	data->publishers = NULL;
-	arrayList_create(pool, &data->publishers);
+	arrayList_create(&data->publishers);
 	data->context = NULL;
 	data->running = false;
 	data->sender = 0;

Modified: incubator/celix/trunk/framework/private/src/bundle.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle.c Tue Dec  3 13:33:43 2013
@@ -63,7 +63,7 @@ celix_status_t bundle_create(bundle_pt *
         (*bundle)->framework = NULL;
         (*bundle)->state = BUNDLE_INSTALLED;
         (*bundle)->modules = NULL;
-        arrayList_create(mp, &(*bundle)->modules);
+        arrayList_create(&(*bundle)->modules);
 
         module = module_createFrameworkModule((*bundle));
         bundle_addModule(*bundle, module);
@@ -103,7 +103,7 @@ celix_status_t bundle_createFromArchive(
 	(*bundle)->framework = framework;
 	(*bundle)->state = BUNDLE_INSTALLED;
 	(*bundle)->modules = NULL;
-	arrayList_create(bundlePool, &(*bundle)->modules);
+	arrayList_create(&(*bundle)->modules);
 
 	
 	status = bundle_createModule(*bundle, &module);

Modified: incubator/celix/trunk/framework/private/src/bundle_cache.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_cache.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_cache.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_cache.c Tue Dec  3 13:33:43 2013
@@ -96,7 +96,7 @@ celix_status_t bundleCache_getArchives(b
 	if (aprStatus == APR_SUCCESS) {
         array_list_pt list = NULL;
 		apr_finfo_t dp;
-        arrayList_create(pool, &list);
+        arrayList_create(&list);
         
         while ((apr_dir_read(&dp, APR_FINFO_DIRENT|APR_FINFO_TYPE, dir)) == APR_SUCCESS) {
         	apr_pool_t *subpool = NULL;

Modified: incubator/celix/trunk/framework/private/src/filter.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/filter.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/filter.c (original)
+++ incubator/celix/trunk/framework/private/src/filter.c Tue Dec  3 13:33:43 2013
@@ -139,7 +139,7 @@ filter_pt filter_parseFilterComp(char * 
 filter_pt filter_parseAnd(char * filterString, int * pos, apr_pool_t *pool) {
 	filter_pt filter = (filter_pt) malloc(sizeof(*filter));
 	array_list_pt operands = NULL;
-	arrayList_create(pool, &operands);
+	arrayList_create(&operands);
 	filter_skipWhiteSpace(filterString, pos);
 
 	if (filterString[*pos] != '(') {
@@ -162,7 +162,7 @@ filter_pt filter_parseAnd(char * filterS
 filter_pt filter_parseOr(char * filterString, int * pos, apr_pool_t *pool) {
 	filter_pt filter = (filter_pt) malloc(sizeof(*filter));
 	array_list_pt operands = NULL;
-	arrayList_create(pool, &operands);
+	arrayList_create(&operands);
 	filter_skipWhiteSpace(filterString, pos);
 
 	if (filterString[*pos] != '(') {
@@ -357,7 +357,7 @@ array_list_pt filter_parseSubstring(char
 	int keepRunning = 1;
 	int size;
 
-	arrayList_create(pool, &operands);
+	arrayList_create(&operands);
 	sub[0] = '\0';
 	while (keepRunning) {
 		char c = filterString[*pos];

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Tue Dec  3 13:33:43 2013
@@ -193,7 +193,7 @@ celix_status_t framework_create(framewor
             apr_pool_t *pool = NULL;
             apr_pool_create(&pool, (*framework)->mp);
             status = CELIX_DO_IF(status, bundle_create(&(*framework)->bundle, pool));
-            status = CELIX_DO_IF(status, arrayList_create((*framework)->mp, &(*framework)->globalLockWaitersList));
+            status = CELIX_DO_IF(status, arrayList_create(&(*framework)->globalLockWaitersList));
             status = CELIX_DO_IF(status, bundle_setFramework((*framework)->bundle, (*framework)));
             if (status == CELIX_SUCCESS) {
                 //
@@ -298,10 +298,10 @@ celix_status_t fw_init(framework_pt fram
 
 	celix_status_t status = CELIX_SUCCESS;
 	status = CELIX_DO_IF(status, framework_acquireBundleLock(framework, framework->bundle, BUNDLE_INSTALLED|BUNDLE_RESOLVED|BUNDLE_STARTING|BUNDLE_ACTIVE));
-	status = CELIX_DO_IF(status, arrayList_create(framework->mp, &framework->serviceListeners));
-	status = CELIX_DO_IF(status, arrayList_create(framework->mp, &framework->bundleListeners));
-	status = CELIX_DO_IF(status, arrayList_create(framework->mp, &framework->frameworkListeners));
-	status = CELIX_DO_IF(status, arrayList_create(framework->mp, &framework->requests));
+	status = CELIX_DO_IF(status, arrayList_create(&framework->serviceListeners));
+	status = CELIX_DO_IF(status, arrayList_create(&framework->bundleListeners));
+	status = CELIX_DO_IF(status, arrayList_create(&framework->frameworkListeners));
+	status = CELIX_DO_IF(status, arrayList_create(&framework->requests));
 	status = CELIX_DO_IF(status, apr_thread_create(&framework->dispatcherThread, NULL, fw_eventDispatcher, framework, framework->mp));
 	status = CELIX_DO_IF(status, bundle_getState(framework->bundle, &state));
 	if (status == CELIX_SUCCESS) {
@@ -890,14 +890,14 @@ celix_status_t fw_stopBundle(framework_p
                 }
                 // #TODO remove listeners for bundle
 
-                // #TODO enable dlclose call
-              dlclose(bundle_getHandle(bundle));
-
                 if (context != NULL) {
                     status = CELIX_DO_IF(status, bundleContext_destroy(context));
                     status = CELIX_DO_IF(status, bundle_setContext(bundle, NULL));
                 }
 
+                // #TODO enable dlclose call
+                dlclose(bundle_getHandle(bundle));
+
                 status = CELIX_DO_IF(status, framework_setBundleStateAndNotify(framework, bundle, BUNDLE_RESOLVED));
             }
 	    }
@@ -1136,9 +1136,7 @@ celix_status_t fw_getDependentBundles(fr
     if (*list == NULL && exporter != NULL && framework != NULL) {
 		array_list_pt modules;
 		unsigned int modIdx = 0;
-		apr_pool_t *pool = NULL;
-		bundle_getMemoryPool(exporter, &pool);
-        arrayList_create(pool, list);
+        arrayList_create(list);
 
         modules = bundle_getModules(exporter);
         for (modIdx = 0; modIdx < arrayList_size(modules); modIdx++) {
@@ -1211,7 +1209,7 @@ celix_status_t fw_registerService(framew
             apr_pool_t *pool = NULL;
 
             status = CELIX_DO_IF(status, bundle_getMemoryPool(bundle, &pool));
-            status = CELIX_DO_IF(status, arrayList_create(pool, &infos));
+            status = CELIX_DO_IF(status, arrayList_create(&infos));
 
             if (status == CELIX_SUCCESS) {
                 celix_status_t subs = CELIX_SUCCESS;
@@ -1396,7 +1394,7 @@ void fw_addServiceListener(framework_pt 
 
 		celix_status_t status = fw_getService(framework, framework->bundle, ref, (void **) &hook);
 
-		arrayList_create(subpool, &infos);
+		arrayList_create(&infos);
 		arrayList_add(infos, info);
 		hook->added(hook->handle, infos);
 		serviceRegistry_ungetService(framework->registry, framework->bundle, ref, &ungetResult);
@@ -1451,13 +1449,11 @@ void fw_removeServiceListener(framework_
 			service_reference_pt ref = (service_reference_pt) arrayList_get(listenerHooks, i);
 			listener_hook_service_pt hook = NULL;
 			array_list_pt infos = NULL;
-			apr_pool_t *pool = NULL;
 			bool ungetResult;
 
 			celix_status_t status = fw_getService(framework, framework->bundle, ref, (void **) &hook);
 
-			bundle_getMemoryPool(bundle, &pool);
-			arrayList_create(pool, &infos);
+			arrayList_create(&infos);
 			arrayList_add(infos, info);
 			hook->removed(hook->handle, infos);
 			serviceRegistry_ungetService(framework->registry, framework->bundle, ref, &ungetResult);
@@ -1691,7 +1687,7 @@ celix_status_t framework_markBundleResol
 array_list_pt framework_getBundles(framework_pt framework) {
 	array_list_pt bundles = NULL;
 	hash_map_iterator_pt iterator;
-	arrayList_create(framework->mp, &bundles);
+	arrayList_create(&bundles);
 	iterator = hashMapIterator_create(framework->installedBundleMap);
 	while (hashMapIterator_hasNext(iterator)) {
 		bundle_pt bundle = (bundle_pt) hashMapIterator_nextValue(iterator);

Modified: incubator/celix/trunk/framework/private/src/module.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/module.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/module.c (original)
+++ incubator/celix/trunk/framework/private/src/module.c Tue Dec  3 13:33:43 2013
@@ -71,7 +71,7 @@ module_pt module_create(manifest_pt head
         module->resolved = false;
 
         module->dependentImporters = NULL;
-        arrayList_create(bundlePool, &module->dependentImporters);
+        arrayList_create(&module->dependentImporters);
 
         if (apr_pool_create(&pool, bundlePool) == APR_SUCCESS) {
             if (manifestParser_create(module, headerMap, pool, &mp) == CELIX_SUCCESS) {
@@ -119,7 +119,7 @@ module_pt module_createFrameworkModule(b
                     linkedList_create(capabilities_pool, &module->capabilities);
                     linkedList_create(requirements_pool, &module->requirements);
                     module->dependentImporters = NULL;
-                    arrayList_create(bundlePool, &module->dependentImporters);
+                    arrayList_create(&module->dependentImporters);
                     module->wires = NULL;
                     module->headerMap = NULL;
                     module->resolved = false;
@@ -235,9 +235,7 @@ void module_removeDependentImporter(modu
 
 array_list_pt module_getDependents(module_pt module) {
     array_list_pt dependents = NULL;
-    apr_pool_t *bundlePool = NULL;
-    bundle_getMemoryPool(module->bundle, &bundlePool);
-    arrayList_create(bundlePool, &dependents);
+    arrayList_create(&dependents);
 
     arrayList_addAll(dependents, module->dependentImporters);
 

Modified: incubator/celix/trunk/framework/private/src/service_registration.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registration.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registration.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registration.c Tue Dec  3 13:33:43 2013
@@ -62,7 +62,7 @@ celix_status_t serviceRegistration_creat
     (*registration)->className = apr_pstrdup(pool,serviceName);
     (*registration)->bundle = bundle;
     (*registration)->references = NULL;
-    arrayList_create(pool, &(*registration)->references);
+    arrayList_create(&(*registration)->references);
 
 	(*registration)->serviceId = serviceId;
 	(*registration)->svcObj = serviceObject;

Modified: incubator/celix/trunk/framework/private/src/service_registry.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registry.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registry.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registry.c Tue Dec  3 13:33:43 2013
@@ -65,7 +65,7 @@ celix_status_t serviceRegistry_create(ap
 		(*registry)->framework = framework;
 		(*registry)->currentServiceId = 1l;
 
-		arrayList_create(pool, &(*registry)->listenerHooks);
+		arrayList_create(&(*registry)->listenerHooks);
 		aprStatus = apr_thread_mutex_create(&(*registry)->mutex, APR_THREAD_MUTEX_NESTED, pool);
 		if (aprStatus != APR_SUCCESS) {
 			status = CELIX_FRAMEWORK_EXCEPTION;
@@ -130,9 +130,7 @@ celix_status_t serviceRegistry_addUsageC
 
 	if (usages == NULL) {
 		module_pt mod = NULL;
-		apr_pool_t *pool = NULL;
-		bundle_getMemoryPool(bundle, &pool);
-		arrayList_create(pool, &usages);
+		arrayList_create(&usages);
 		bundle_getCurrentModule(bundle, &mod);
 	}
 	arrayList_add(usages, usage);
@@ -169,7 +167,7 @@ celix_status_t serviceRegistry_getRegist
 	array_list_pt regs = (array_list_pt) hashMap_get(registry->serviceRegistrations, bundle);
 	if (regs != NULL) {
 		unsigned int i;
-		arrayList_create(pool, services);
+		arrayList_create(services);
 		
 		for (i = 0; i < arrayList_size(regs); i++) {
 			service_registration_pt reg = arrayList_get(regs, i);
@@ -214,7 +212,7 @@ celix_status_t serviceRegistry_registerS
 	regs = (array_list_pt) hashMap_get(registry->serviceRegistrations, bundle);
 	if (regs == NULL) {
 		regs = NULL;
-		arrayList_create(pool, &regs);
+		arrayList_create(&regs);
 	}
 	arrayList_add(regs, *registration);
 	hashMap_put(registry->serviceRegistrations, bundle, regs);
@@ -341,7 +339,7 @@ celix_status_t serviceRegistry_getServic
 	celix_status_t status = CELIX_SUCCESS;
 	hash_map_values_pt registrations;
 	hash_map_iterator_pt iterator;
-	arrayList_create(pool, references);
+	arrayList_create(references);
 
 	registrations = hashMapValues_create(registry->serviceRegistrations);
 	iterator = hashMapValues_iterator(registrations);
@@ -408,9 +406,7 @@ celix_status_t serviceRegistry_getServic
 	array_list_pt usages = hashMap_get(registry->inUseMap, bundle);
 	if (usages != NULL) {
 		unsigned int i;
-		apr_pool_t *pool = NULL;
-		bundle_getMemoryPool(bundle, &pool);
-		arrayList_create(pool, services);
+		arrayList_create(services);
 		
 		for (i = 0; i < arrayList_size(usages); i++) {
 			usage_count_pt usage = arrayList_get(usages, i);
@@ -500,7 +496,7 @@ void serviceRegistry_ungetServices(servi
 	}
 
 	// usage arrays?
-	fusages = arrayList_clone(pool, usages);
+	fusages = arrayList_clone(usages);
 	
 	for (i = 0; i < arrayList_size(fusages); i++) {
 		usage_count_pt usage = arrayList_get(fusages, i);
@@ -517,9 +513,7 @@ void serviceRegistry_ungetServices(servi
 array_list_pt serviceRegistry_getUsingBundles(service_registry_pt registry, apr_pool_t *pool, service_reference_pt reference) {
 	array_list_pt bundles = NULL;
 	hash_map_iterator_pt iter;
-	apr_pool_t *npool;
-	apr_pool_create(&npool, pool);
-	arrayList_create(npool, &bundles);
+	arrayList_create(&bundles);
 	iter = hashMapIterator_create(registry->inUseMap);
 	while (hashMapIterator_hasNext(iter)) {
 		hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
@@ -567,7 +561,7 @@ celix_status_t serviceRegistry_getListen
 	if (registry == NULL || *hooks != NULL) {
 		status = CELIX_ILLEGAL_ARGUMENT;
 	} else {
-		status = arrayList_create(pool, hooks);
+		status = arrayList_create(hooks);
 		if (status == CELIX_SUCCESS) {
 			unsigned int i;
 			for (i = 0; i < arrayList_size(registry->listenerHooks); i++) {

Modified: incubator/celix/trunk/framework/private/src/service_tracker.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_tracker.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_tracker.c (original)
+++ incubator/celix/trunk/framework/private/src/service_tracker.c Tue Dec  3 13:33:43 2013
@@ -77,7 +77,7 @@ celix_status_t serviceTracker_createWith
 		(*tracker)->pool = pool;
 		(*tracker)->tracker = *tracker;
 		(*tracker)->tracked = NULL;
-		arrayList_create(pool, &(*tracker)->tracked);
+		arrayList_create(&(*tracker)->tracked);
 		(*tracker)->customizer = customizer;
 		(*tracker)->listener = NULL;
 	}
@@ -167,7 +167,7 @@ array_list_pt serviceTracker_getServiceR
 	unsigned int i;
 	int size = arrayList_size(tracker->tracked);
 	array_list_pt references = NULL;
-	arrayList_create(tracker->pool, &references);
+	arrayList_create(&references);
 	
 	for (i = 0; i < arrayList_size(tracker->tracked); i++) {
 		tracked = (tracked_pt) arrayList_get(tracker->tracked, i);
@@ -191,7 +191,7 @@ array_list_pt serviceTracker_getServices
 	unsigned int i;
 	int size = arrayList_size(tracker->tracked);
 	array_list_pt references = NULL;
-	arrayList_create(tracker->pool, &references);
+	arrayList_create(&references);
 	
 	for (i = 0; i < arrayList_size(tracker->tracked); i++) {
 		tracked = (tracked_pt) arrayList_get(tracker->tracked, i);

Modified: incubator/celix/trunk/framework/private/test/bundle_context_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/bundle_context_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/bundle_context_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/bundle_context_test.cpp Tue Dec  3 13:33:43 2013
@@ -284,7 +284,7 @@ TEST(bundle_context, getServiceReference
 
 	char serviceName[] = "service";
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 

Modified: incubator/celix/trunk/framework/private/test/bundle_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/bundle_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/bundle_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/bundle_test.cpp Tue Dec  3 13:33:43 2013
@@ -126,7 +126,7 @@ TEST(bundle, createFromArchive) {
 		.andReturnValue(CELIX_SUCCESS);
 
 	array_list_pt bundles = NULL;
-	arrayList_create(pool, &bundles);
+	arrayList_create(&bundles);
 	mock().expectOneCall("framework_getBundles")
 		.withParameter("framework", framework)
 		.andReturnValue(bundles);
@@ -175,7 +175,7 @@ TEST(bundle, getCurrentModule) {
 	module_pt module2 = (module_pt) 0x12;
 	module_pt module3 = (module_pt) 0x13;
 	module_pt module4 = (module_pt) 0x14;
-	arrayList_create(pool, &bundle->modules);
+	arrayList_create(&bundle->modules);
 	arrayList_add(bundle->modules, module1);
 	arrayList_add(bundle->modules, module2);
 	arrayList_add(bundle->modules, module3);

Modified: incubator/celix/trunk/framework/private/test/service_reference_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/service_reference_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/service_reference_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/service_reference_test.cpp Tue Dec  3 13:33:43 2013
@@ -105,7 +105,7 @@ TEST(service_reference, getUsingBundle) 
 	service_registry_pt registry = (service_registry_pt) 0x20;
 
 	array_list_pt bundles = NULL;
-	arrayList_create(pool, &bundles);
+	arrayList_create(&bundles);
 	bundle_pt bundle = (bundle_pt) 0x30;
 	arrayList_add(bundles, bundle);
 

Modified: incubator/celix/trunk/framework/private/test/service_registry_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/service_registry_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/service_registry_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/service_registry_test.cpp Tue Dec  3 13:33:43 2013
@@ -80,7 +80,7 @@ TEST(service_registry, getRegisteredServ
 	registry->serviceRegistrations = hashMap_create(NULL, NULL, NULL, NULL);
 
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	service_registration_pt reg = (service_registration_pt) 0x10;
 	arrayList_add(registrations, reg);
 	bundle_pt bundle = (bundle_pt) 0x20;
@@ -89,7 +89,7 @@ TEST(service_registry, getRegisteredServ
 	service_reference_pt ref = (service_reference_pt) 0x30;
 
 	array_list_pt refs = NULL;
-	arrayList_create(pool, &refs);
+	arrayList_create(&refs);
 
 	mock()
 		.expectOneCall("serviceRegistration_isValid")
@@ -135,7 +135,7 @@ TEST(service_registry, getServicesInUse)
 	registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL);
 
 	array_list_pt usages = NULL;
-	arrayList_create(pool, &usages);
+	arrayList_create(&usages);
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_reference_pt ref = (service_reference_pt) 0x20;
 	usage_count_pt usage = (usage_count_pt) apr_palloc(pool, sizeof(*usage));
@@ -143,12 +143,6 @@ TEST(service_registry, getServicesInUse)
 	arrayList_add(usages, usage);
 	hashMap_put(registry->inUseMap, bundle, usages);
 
-	mock()
-		.expectOneCall("bundle_getMemoryPool")
-		.withParameter("bundle", bundle)
-		.andOutputParameter("pool", pool)
-		.andReturnValue(CELIX_SUCCESS);
-
 	array_list_pt inUse = NULL;
 	serviceRegistry_getServicesInUse(registry, bundle, &inUse);
 	LONGS_EQUAL(1, arrayList_size(inUse));
@@ -231,7 +225,7 @@ TEST(service_registry, unregisterService
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
@@ -239,7 +233,7 @@ TEST(service_registry, unregisterService
 	properties_pt properties = (properties_pt) 0x30;
 
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
@@ -283,7 +277,7 @@ TEST(service_registry, unregisterService
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
@@ -310,14 +304,14 @@ TEST(service_registry, getServiceReferen
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	properties_pt properties = (properties_pt) 0x30;
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
@@ -380,14 +374,14 @@ TEST(service_registry, getService) {
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	properties_pt properties = (properties_pt) 0x30;
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
@@ -405,11 +399,6 @@ TEST(service_registry, getService) {
 		.withParameter("registration", registration)
 		.andReturnValue(true);
 	mock()
-		.expectOneCall("bundle_getMemoryPool")
-		.withParameter("bundle", bundle)
-		.andOutputParameter("pool", pool)
-		.andReturnValue(CELIX_SUCCESS);
-	mock()
 		.expectOneCall("bundle_getCurrentModule")
 		.withParameter("bundle", bundle)
 		.andOutputParameter("module", module)
@@ -440,19 +429,19 @@ TEST(service_registry, ungetService) {
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	properties_pt properties = (properties_pt) 0x30;
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
 	array_list_pt usages = NULL;
-	arrayList_create(pool, &usages);
+	arrayList_create(&usages);
 	usage_count_pt usage = (usage_count_pt) malloc(sizeof(*usage));
 	usage->reference = reference;
 	apr_pool_create(&usage->pool, pool);
@@ -484,19 +473,19 @@ TEST(service_registry, ungetServivces) {
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	properties_pt properties = (properties_pt) 0x30;
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
 	array_list_pt usages = NULL;
-	arrayList_create(pool, &usages);
+	arrayList_create(&usages);
 	usage_count_pt usage = (usage_count_pt) malloc(sizeof(*usage));
 	usage->reference = reference;
 	usage->count = 1;
@@ -543,19 +532,19 @@ TEST(service_registry, getUsingBundles) 
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	array_list_pt registrations = NULL;
-	arrayList_create(pool, &registrations);
+	arrayList_create(&registrations);
 	arrayList_add(registrations, registration);
 
 	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	properties_pt properties = (properties_pt) 0x30;
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
 	array_list_pt usages = NULL;
-	arrayList_create(pool, &usages);
+	arrayList_create(&usages);
 	usage_count_pt usage = (usage_count_pt) malloc(sizeof(*usage));
 	usage->reference = reference;
 	arrayList_add(usages, usage);
@@ -576,13 +565,13 @@ TEST(service_registry, createServiceRefe
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 //	array_list_pt registrations = NULL;
-//	arrayList_create(pool, &registrations);
+//	arrayList_create(&registrations);
 //	arrayList_add(registrations, registration);
 //
 //	hashMap_put(registry->serviceRegistrations, bundle, registrations);
 
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 
@@ -623,14 +612,14 @@ TEST(service_registry, createServiceRefe
 TEST(service_registry, getListenerHooks) {
 	service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry));
 	registry->listenerHooks = NULL;
-	arrayList_create(pool, &registry->listenerHooks);
+	arrayList_create(&registry->listenerHooks);
 
 	bundle_pt bundle = (bundle_pt) 0x10;
 	service_registration_pt registration = (service_registration_pt) 0x20;
 	arrayList_add(registry->listenerHooks, registration);
 
 	array_list_pt references = NULL;
-	arrayList_create(pool, &references);
+	arrayList_create(&references);
 	service_reference_pt reference = (service_reference_pt) 0x40;
 	arrayList_add(references, reference);
 

Modified: incubator/celix/trunk/framework/private/test/service_tracker_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/service_tracker_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/service_tracker_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/service_tracker_test.cpp Tue Dec  3 13:33:43 2013
@@ -115,11 +115,11 @@ TEST(service_tracker, open) {
 	tracker->filter = (char *) filter.c_str();
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 
 	array_list_pt refs = NULL;
-	arrayList_create(pool, &refs);
+	arrayList_create(&refs);
 
 	mock().strictOrder();
 	mock()
@@ -154,7 +154,7 @@ TEST(service_tracker, open_withRefs) {
 	tracker->filter = (char *) filter.c_str();
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 //	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -169,7 +169,7 @@ TEST(service_tracker, open_withRefs) {
 //	arrayList_add(tracked, entry2);
 
 	array_list_pt refs = NULL;
-	arrayList_create(pool, &refs);
+	arrayList_create(&refs);
 	service_reference_pt ref = (service_reference_pt) apr_palloc(pool, sizeof(*ref));
 	arrayList_add(refs, ref);
 	void *src = (void *) 0x345;
@@ -213,7 +213,7 @@ TEST(service_tracker, open_withRefsAndTr
 	tracker->filter = (char *) filter.c_str();
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -223,7 +223,7 @@ TEST(service_tracker, open_withRefsAndTr
 	arrayList_add(tracked, entry);
 
 	array_list_pt refs = NULL;
-	arrayList_create(pool, &refs);
+	arrayList_create(&refs);
 	arrayList_add(refs, ref);
 	void *src = (void *) 0x345;
 
@@ -265,7 +265,7 @@ TEST(service_tracker, close) {
 	tracker->listener = (service_listener_pt) listener;
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -300,7 +300,7 @@ TEST(service_tracker, getServiceReferenc
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -323,7 +323,7 @@ TEST(service_tracker, getServiceReferenc
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 
 	service_reference_pt reference = serviceTracker_getServiceReference(tracker);
@@ -335,7 +335,7 @@ TEST(service_tracker, getServiceReferenc
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -360,7 +360,7 @@ TEST(service_tracker, getService) {
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -383,7 +383,7 @@ TEST(service_tracker, getServiceNull) {
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 
 	void *service = serviceTracker_getService(tracker);
@@ -395,7 +395,7 @@ TEST(service_tracker, getServices) {
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -420,7 +420,7 @@ TEST(service_tracker, getServiceByRefere
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -445,7 +445,7 @@ TEST(service_tracker, getServiceByRefere
 	service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker));
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -477,7 +477,7 @@ TEST(service_tracker, serviceChangedRegi
 	tracker->listener = listener;
 	listener->handle = tracker;
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 
 	service_reference_pt ref = (service_reference_pt) 0x51;
@@ -510,7 +510,7 @@ TEST(service_tracker, serviceChangedModi
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -546,7 +546,7 @@ TEST(service_tracker, serviceChangedUnre
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -587,7 +587,7 @@ TEST(service_tracker, serviceChangedModi
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -625,7 +625,7 @@ TEST(service_tracker, serviceChangedRegi
 	tracker->listener = listener;
 	listener->handle = tracker;
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 	service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) 0x20;
 	tracker->customizer = customizer;
@@ -684,7 +684,7 @@ TEST(service_tracker, serviceChangedModi
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -739,7 +739,7 @@ TEST(service_tracker, serviceChangedUnre
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));
@@ -788,7 +788,7 @@ TEST(service_tracker, serviceChangedUnre
 
 	// new tracker->tracked
 	array_list_pt tracked = NULL;
-	arrayList_create(pool, &tracked);
+	arrayList_create(&tracked);
 	tracker->tracked = tracked;
 //	// add tracked to tracker->tracked
 	tracked_pt entry = (tracked_pt) malloc(sizeof(*entry));

Modified: incubator/celix/trunk/launcher/private/src/launcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/private/src/launcher.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/private/src/launcher.c (original)
+++ incubator/celix/trunk/launcher/private/src/launcher.c Tue Dec  3 13:33:43 2013
@@ -96,7 +96,7 @@ int main(void) {
                 }
                 // First install all bundles
                 // Afterwards start them
-                arrayList_create(pool, &installed);
+                arrayList_create(&installed);
                 framework_getFrameworkBundle(framework, &bundle);
                 bundle_getContext(bundle, &context);
                 iter = linkedListIterator_create(bundles, 0);

Modified: incubator/celix/trunk/log_service/private/src/log.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log.c (original)
+++ incubator/celix/trunk/log_service/private/src/log.c Tue Dec  3 13:33:43 2013
@@ -70,9 +70,9 @@ celix_status_t log_create(apr_pool_t *po
 
         (*logger)->pool = pool;
         (*logger)->listeners = NULL;
-		arrayList_create(pool, &(*logger)->listeners);
+		arrayList_create(&(*logger)->listeners);
         (*logger)->listenerEntries = NULL;
-        arrayList_create(pool, &(*logger)->listenerEntries);
+        arrayList_create(&(*logger)->listenerEntries);
         (*logger)->listenerThread = NULL;
         (*logger)->running = false;
         apr_status = apr_thread_cond_create(&(*logger)->entriesToDeliver, pool);

Modified: incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c Tue Dec  3 13:33:43 2013
@@ -95,9 +95,9 @@ celix_status_t discovery_create(apr_pool
 			printf("No RemoteServiceAdmin port set, set it using RSA_PORT!\n");
 		}
 		(*discovery)->handled = NULL;
-		arrayList_create(pool, &(*discovery)->handled);
+		arrayList_create(&(*discovery)->handled);
 		(*discovery)->registered = NULL;
-		arrayList_create(pool, &(*discovery)->registered);
+		arrayList_create(&(*discovery)->registered);
 
 		apr_thread_create(&(*discovery)->slpPoll, NULL, discovery_pollSLP, *discovery, (*discovery)->pool);
 	}
@@ -358,7 +358,7 @@ celix_status_t discovery_updateEndpointL
 	array_list_pt scopes = hashMap_get(discovery->listenerReferences, reference);
 	if (scopes == NULL) {
 		scopes = NULL;
-		arrayList_create(discovery->pool, &scopes);
+		arrayList_create(&scopes);
 		hashMap_put(discovery->listenerReferences, reference, scopes);
 	}
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c Tue Dec  3 13:33:43 2013
@@ -191,7 +191,7 @@ celix_status_t remoteServiceAdmin_handle
 
 celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations) {
 	celix_status_t status = CELIX_SUCCESS;
-	arrayList_create(admin->pool, registrations);
+	arrayList_create(registrations);
 	array_list_pt references = NULL;
 	service_reference_pt reference = NULL;
 	service_registration_pt registration = NULL;
@@ -226,7 +226,7 @@ celix_status_t remoteServiceAdmin_export
 	} else {
 		printf("RSA: Export services (%s)\n", exports);
 		array_list_pt interfaces = NULL;
-		arrayList_create(admin->pool, &interfaces);
+		arrayList_create(&interfaces);
 		if (strcmp(utils_stringTrim(exports), "*") == 0) {
 			char *token;
 			char *interface = apr_strtok(provided, ",", &token);
@@ -392,7 +392,7 @@ celix_status_t remoteServiceAdmin_import
 
 	array_list_pt importedRegs = hashMap_get(admin->importedServices, endpoint);
 	if (importedRegs == NULL) {
-		arrayList_create(admin->pool, &importedRegs);
+		arrayList_create(&importedRegs);
 		hashMap_put(admin->importedServices, endpoint, importedRegs);
 	}
 	arrayList_add(importedRegs, *registration);

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c Tue Dec  3 13:33:43 2013
@@ -117,7 +117,7 @@ celix_status_t remoteServiceAdmin_handle
 
 celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations) {
 	celix_status_t status = CELIX_SUCCESS;
-	arrayList_create(admin->pool, registrations);
+	arrayList_create(registrations);
 
 	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
@@ -131,7 +131,7 @@ celix_status_t remoteServiceAdmin_export
 	} else {
 		printf("RSA: Export services (%s)\n", exports);
 		array_list_t interfaces = NULL;
-		arrayList_create(admin->pool, &interfaces);
+		arrayList_create(&interfaces);
 		if (strcmp(utils_stringTrim(exports), "*") == 0) {
 			char *token;
 			char *interface = apr_strtok(provided, ",", &token);
@@ -251,7 +251,7 @@ celix_status_t remoteServiceAdmin_import
 
 	array_list_t importedRegs = hashMap_get(admin->importedServices, endpoint);
 	if (importedRegs == NULL) {
-		arrayList_create(admin->pool, &importedRegs);
+		arrayList_create(&importedRegs);
 		hashMap_put(admin->importedServices, endpoint, importedRegs);
 	}
 	arrayList_add(importedRegs, *registration);

Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Tue Dec  3 13:33:43 2013
@@ -71,7 +71,7 @@ celix_status_t topologyManager_create(bu
 		(*manager)->pool = pool;
 		(*manager)->context = context;
 		(*manager)->rsaList = NULL;
-		arrayList_create(pool, &(*manager)->rsaList);
+		arrayList_create(&(*manager)->rsaList);
 		(*manager)->exportedServices = hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
 		(*manager)->importedServices = hashMap_create(NULL, NULL, NULL, NULL);
 		(*manager)->importInterests = hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);

Modified: incubator/celix/trunk/remote_shell/private/src/remote_shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/remote_shell.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/remote_shell.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/remote_shell.c Tue Dec  3 13:33:43 2013
@@ -86,7 +86,7 @@ celix_status_t remoteShell_create(apr_po
 
 		status = apr_thread_mutex_create(&(*instance)->mutex, APR_THREAD_MUTEX_DEFAULT, pool);
 		status = apr_thread_pool_create(&(*instance)->threadPool, 0, maximumConnections, pool);
-		status = arrayList_create(pool, &(*instance)->connections);
+		status = arrayList_create(&(*instance)->connections);
 	} else {
 		status = CELIX_ENOMEM;
 	}

Modified: incubator/celix/trunk/shell/private/src/inspect_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/inspect_command.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/inspect_command.c (original)
+++ incubator/celix/trunk/shell/private/src/inspect_command.c Tue Dec  3 13:33:43 2013
@@ -72,7 +72,7 @@ void inspectCommand_execute(command_pt c
 			char *id = apr_strtok(NULL, " ", &token);
 
 			bundleContext_getMemoryPool(command->bundleContext, &pool);
-			arrayList_create(pool, &ids);
+			arrayList_create(&ids);
 			while (id != NULL) {
 				arrayList_add(ids, id);
 				id = apr_strtok(NULL, " ", &token);
@@ -113,7 +113,7 @@ celix_status_t inspectCommand_printExpor
 		unsigned int i;
 
 		bundleContext_getMemoryPool(command->bundleContext, &pool);
-		arrayList_create(pool, &bundles);
+		arrayList_create(&bundles);
 		for (i = 0; i < arrayList_size(ids); i++) {
 			char *idStr = (char *) arrayList_get(ids, i);
 			long id = atol(idStr);

Modified: incubator/celix/trunk/shell/private/src/shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/shell.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/shell.c (original)
+++ incubator/celix/trunk/shell/private/src/shell.c Tue Dec  3 13:33:43 2013
@@ -108,7 +108,7 @@ array_list_pt shell_getCommands(shell_pt
 	array_list_pt commands = NULL;
 	hash_map_iterator_pt iter = hashMapIterator_create(shell->commandNameMap);
 
-	arrayList_create(shell->pool, &commands);
+	arrayList_create(&commands);
 	while (hashMapIterator_hasNext(iter)) {
 		char * name = hashMapIterator_nextKey(iter);
 		arrayList_add(commands, name);

Modified: incubator/celix/trunk/utils/private/src/array_list.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/src/array_list.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/src/array_list.c (original)
+++ incubator/celix/trunk/utils/private/src/array_list.c Tue Dec  3 13:33:43 2013
@@ -32,19 +32,16 @@
 
 static celix_status_t arrayList_elementEquals(void *a, void *b, bool *equals);
 
-celix_status_t arrayList_create(apr_pool_t *pool, array_list_pt *list) {
-	return arrayList_createWithEquals(pool, arrayList_elementEquals, list);
+celix_status_t arrayList_create(array_list_pt *list) {
+	return arrayList_createWithEquals(arrayList_elementEquals, list);
 }
 
- celix_status_t arrayList_createWithEquals(apr_pool_t *pool, array_list_element_equals_pt equals, array_list_pt *list) {
-	apr_pool_t *mypool;
-	apr_pool_create(&mypool, pool);
-//	*list = (array_list_pt) apr_palloc(mypool, sizeof(**list));
+ celix_status_t arrayList_createWithEquals(array_list_element_equals_pt equals, array_list_pt *list) {
 	*list = (array_list_pt) malloc(sizeof(**list));
 
 	(*list)->equals = equals;
 	(*list)->size = 0;
-	(*list)->capacity = 10;
+	(*list)->capacity = 1000;
 	(*list)->modCount = 0;
 	(*list)->elementData = (void **) malloc(sizeof(void*) * (*list)->capacity);
 
@@ -256,10 +253,10 @@ bool arrayList_addAll(array_list_pt list
     return size != 0;
 }
 
-array_list_pt arrayList_clone(apr_pool_t *pool, array_list_pt list) {
+array_list_pt arrayList_clone(array_list_pt list) {
 	unsigned int i;
 	array_list_pt new = NULL;
-	arrayList_create(pool, &new);
+	arrayList_create(&new);
 //	arrayList_ensureCapacity(new, list->size);
 //	memcpy(new->elementData, list->elementData, list->size);
 //	new->size = list->size;

Modified: incubator/celix/trunk/utils/private/test/array_list_test.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/array_list_test.c?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/array_list_test.c (original)
+++ incubator/celix/trunk/utils/private/test/array_list_test.c Tue Dec  3 13:33:43 2013
@@ -40,7 +40,7 @@ array_list_pt list;
 int setup(void) {
 	apr_initialize();
 	apr_pool_create(&memory_pool, NULL);
-	arrayList_create(memory_pool, &list);
+	arrayList_create(&list);
 	if (list == NULL) {
 		return 1;
 	}
@@ -68,7 +68,7 @@ void test_arrayList_trimToSize(void) {
 
 void test_arrayList_ensureCapacity(void) {
 	int i;
-	arrayList_create(memory_pool, &list);
+	arrayList_create(&list);
 	arrayList_clear(list);
 	CU_ASSERT_EQUAL(list->capacity, 10);
 	CU_ASSERT_EQUAL(list->size, 0);
@@ -77,7 +77,7 @@ void test_arrayList_ensureCapacity(void)
 	}
 	CU_ASSERT_EQUAL(list->capacity, 133);
 	CU_ASSERT_EQUAL(list->size, 100);
-	arrayList_create(memory_pool, &list);
+	arrayList_create(&list);
 }
 
 void test_arrayList_size(void) {
@@ -227,7 +227,7 @@ void test_arrayList_addAll(void) {
 	
 	arrayList_clear(list);
 
-	arrayList_create(memory_pool, &toAdd);
+	arrayList_create(&toAdd);
     arrayList_add(toAdd, entry);
     arrayList_add(toAdd, entry2);
 

Modified: incubator/celix/trunk/utils/private/test/array_list_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/array_list_test.cpp?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/array_list_test.cpp (original)
+++ incubator/celix/trunk/utils/private/test/array_list_test.cpp Tue Dec  3 13:33:43 2013
@@ -27,7 +27,7 @@ TEST_GROUP(array_list) {
 		apr_initialize();
 		apr_pool_create(&pool, NULL);
 
-		arrayList_create(pool, &list);
+		arrayList_create(&list);
 	}
 };
 
@@ -54,7 +54,7 @@ TEST(array_list, trimToSize) {
 
 TEST(array_list, ensureCapacity) {
 	int i;
-	arrayList_create(pool, &list);
+	arrayList_create(&list);
 	arrayList_clear(list);
 
 	LONGS_EQUAL(list->capacity, 10);
@@ -67,12 +67,12 @@ TEST(array_list, ensureCapacity) {
 	}
 	LONGS_EQUAL(list->capacity, 133);
 	LONGS_EQUAL(list->size, 100);
-	arrayList_create(pool, &list);
+	arrayList_create(&list);
 }
 
 TEST(array_list, clone) {
 	int i;
-	arrayList_create(pool, &list);
+	arrayList_create(&list);
 	arrayList_clear(list);
 
 	LONGS_EQUAL(list->capacity, 10);
@@ -88,7 +88,7 @@ TEST(array_list, clone) {
 	LONGS_EQUAL(12, list->size);
 
 	array_list_pt clone = NULL;
-	clone = arrayList_clone(pool, list);
+	clone = arrayList_clone(list);
 
 	LONGS_EQUAL(16, clone->capacity);
 	LONGS_EQUAL(12, clone->size);
@@ -103,5 +103,5 @@ TEST(array_list, clone) {
 		STRCMP_EQUAL((char *) entry, entrys);
 	}
 
-	arrayList_create(pool, &list);
+	arrayList_create(&list);
 }

Modified: incubator/celix/trunk/utils/public/include/array_list.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/public/include/array_list.h?rev=1547384&r1=1547383&r2=1547384&view=diff
==============================================================================
--- incubator/celix/trunk/utils/public/include/array_list.h (original)
+++ incubator/celix/trunk/utils/public/include/array_list.h Tue Dec  3 13:33:43 2013
@@ -39,8 +39,8 @@ typedef struct arrayListIterator * array
 
 typedef celix_status_t (*array_list_element_equals_pt)(void *, void *, bool *equals);
 
-UTILS_EXPORT celix_status_t arrayList_create(apr_pool_t *pool, array_list_pt *list);
-UTILS_EXPORT celix_status_t arrayList_createWithEquals(apr_pool_t *pool, array_list_element_equals_pt equals, array_list_pt *list);
+UTILS_EXPORT celix_status_t arrayList_create(array_list_pt *list);
+UTILS_EXPORT celix_status_t arrayList_createWithEquals(array_list_element_equals_pt equals, array_list_pt *list);
 
 UTILS_EXPORT void arrayList_destroy(array_list_pt list);
 UTILS_EXPORT void arrayList_trimToSize(array_list_pt list);
@@ -58,7 +58,7 @@ UTILS_EXPORT bool arrayList_addAll(array
 UTILS_EXPORT void * arrayList_remove(array_list_pt list, unsigned int index);
 UTILS_EXPORT bool arrayList_removeElement(array_list_pt list, void * element);
 UTILS_EXPORT void arrayList_clear(array_list_pt list);
-UTILS_EXPORT array_list_pt arrayList_clone(apr_pool_t *pool, array_list_pt list);
+UTILS_EXPORT array_list_pt arrayList_clone(array_list_pt list);
 
 UTILS_EXPORT array_list_iterator_pt arrayListIterator_create(array_list_pt list);
 UTILS_EXPORT void arrayListIterator_destroy(array_list_iterator_pt iterator);



Mime
View raw message