You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2013/06/26 08:25:23 UTC

svn commit: r1496777 - in /incubator/celix/trunk: deployment_admin/private/src/ device_access/device_access/private/src/ remote_services/remote_service_admin/private/src/

Author: abroekhuis
Date: Wed Jun 26 06:25:22 2013
New Revision: 1496777

URL: http://svn.apache.org/r1496777
Log:
CELIX-60: Fixed bundle_start and bundle_stop calls.

Modified:
    incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c

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=1496777&r1=1496776&r2=1496777&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Wed Jun 26 06:25:22 2013
@@ -336,7 +336,7 @@ celix_status_t deploymentAdmin_stopDeplo
 			bundle_info_pt info = arrayList_get(infos, i);
 			deploymentPackage_getBundle(target, info->symbolicName, &bundle);
 			if (bundle != NULL) {
-				bundle_stop(bundle, 0);
+				bundle_stop(bundle);
 			} else {
 				printf("DEPLOYMENT_ADMIN: Bundle %s not found\n", info->symbolicName);
 			}
@@ -418,7 +418,7 @@ celix_status_t deploymentAdmin_startDepl
 
 	for (i = 0; i < arrayList_size(bundles); i++) {
 		bundle_pt bundle = arrayList_get(bundles, i);
-		bundle_start(bundle, 0);
+		bundle_start(bundle);
 	}
 
 	apr_pool_destroy(tmpPool);
@@ -558,7 +558,7 @@ celix_status_t deploymentAdmin_startDepl
 		if (!info->customizer) {
 			deploymentPackage_getBundle(source, info->symbolicName, &bundle);
 			if (bundle != NULL) {
-				bundle_start(bundle, 0);
+				bundle_start(bundle);
 			} else {
 				printf("DEPLOYMENT_ADMIN: Could not start bundle %s\n", info->symbolicName);
 			}

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=1496777&r1=1496776&r2=1496777&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 Wed Jun 26 06:25:22 2013
@@ -177,7 +177,7 @@ celix_status_t driverLoader_loadDriverFo
 				char *location = apr_pstrcat(bundlePool, DRIVER_LOCATION_PREFIX, driverId, NULL);
 				status = bundleContext_installBundle2(loader->context, location, filename, &bundle);
 				if (status == CELIX_SUCCESS) {
-					status = bundle_start(bundle, 0);
+					status = bundle_start(bundle);
 					if (status == CELIX_SUCCESS) {
 						status = bundle_getRegisteredServices(bundle, pool, references);
 						if (status == CELIX_SUCCESS) {

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c?rev=1496777&r1=1496776&r2=1496777&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c Wed Jun 26 06:25:22 2013
@@ -173,7 +173,7 @@ celix_status_t exportRegistration_open(e
 	char *name = apr_pstrcat(registration->pool, bundleStore, "/", registration->endpointDescription->service, "_endpoint.zip", NULL);
 	status = bundleContext_installBundle(registration->context, name, &registration->bundle);
 	if (status == CELIX_SUCCESS) {
-		status = bundle_start(registration->bundle, 0);
+		status = bundle_start(registration->bundle);
 		if (status == CELIX_SUCCESS) {
 		}
 	}
@@ -186,7 +186,7 @@ celix_status_t exportRegistration_close(
 
 	exportRegistration_stopTracking(registration);
 
-	bundle_stop(registration->bundle, 0);
+	bundle_stop(registration->bundle);
 	bundle_uninstall(registration->bundle);
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c?rev=1496777&r1=1496776&r2=1496777&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c Wed Jun 26 06:25:22 2013
@@ -171,7 +171,7 @@ celix_status_t importRegistration_open(i
 	char *name = apr_pstrcat(registration->pool, bundleStore, "/", registration->endpointDescription->service, "_proxy.zip", NULL);
 	status = bundleContext_installBundle(registration->context, name, &registration->bundle);
 	if (status == CELIX_SUCCESS) {
-		status = bundle_start(registration->bundle, 0);
+		status = bundle_start(registration->bundle);
 		if (status == CELIX_SUCCESS) {
 		}
 	}
@@ -185,7 +185,7 @@ celix_status_t importRegistration_close(
 	importRegistration_stopTracking(registration);
 
 	if (registration->bundle != NULL) {
-		bundle_stop(registration->bundle, 0);
+		bundle_stop(registration->bundle);
 		bundle_uninstall(registration->bundle);
 	}