celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1630030 - in /celix/trunk: framework/private/src/framework.c remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
Date Wed, 08 Oct 2014 08:41:26 GMT
Author: abroekhuis
Date: Wed Oct  8 08:41:26 2014
New Revision: 1630030

URL: http://svn.apache.org/r1630030
Log:
CELIX-151: Removed debug printing/

Modified:
    celix/trunk/framework/private/src/framework.c
    celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c

Modified: celix/trunk/framework/private/src/framework.c
URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/src/framework.c?rev=1630030&r1=1630029&r2=1630030&view=diff
==============================================================================
--- celix/trunk/framework/private/src/framework.c (original)
+++ celix/trunk/framework/private/src/framework.c Wed Oct  8 08:41:26 2014
@@ -796,7 +796,6 @@ celix_status_t fw_stopBundle(framework_p
     char *error = NULL;
 
 	status = CELIX_DO_IF(status, framework_acquireBundleLock(framework, bundle, OSGI_FRAMEWORK_BUNDLE_INSTALLED|OSGI_FRAMEWORK_BUNDLE_RESOLVED|OSGI_FRAMEWORK_BUNDLE_STARTING|OSGI_FRAMEWORK_BUNDLE_ACTIVE));
-	printf("Stop status: %d\n", status);
 
 	if (record) {
 	    status = CELIX_DO_IF(status, bundle_setPersistentStateInactive(bundle));
@@ -922,7 +921,6 @@ celix_status_t fw_uninstallBundle(framew
     status = CELIX_DO_IF(status, bundle_getArchive(bundle, &archive));
     status = CELIX_DO_IF(status, bundleArchive_getLocation(archive, &location));
     if (status == CELIX_SUCCESS) {
-        printf("Uninstall %s\n", location);
         // TODO sync issues?
         target = (bundle_pt) hashMap_remove(framework->installedBundleMap, location);
 
@@ -962,7 +960,6 @@ celix_status_t fw_uninstallBundle(framew
             if (refreshStatus != CELIX_SUCCESS) {
                 printf("Could not refresh bundle");
             } else {
-                printf("destroy bundle: %s %p\n", location, bundle);
                 status = CELIX_DO_IF(status, bundle_destroy(bundle));
             }
 
@@ -1842,12 +1839,10 @@ celix_status_t framework_acquireBundleLo
 			bundle_state_e state;
 			bundle_getState(bundle, &state);
 			if ((desiredStates & state) == 0) {
-			    printf("Lock failed - state %d\n", state);
 				status = CELIX_ILLEGAL_STATE;
 			} else {
 				if (bundle_lock(bundle, &locked)) {
 					if (!locked) {
-					    printf("Lock failed\n");
 						status = CELIX_ILLEGAL_STATE;
 					}
 				}
@@ -1969,19 +1964,13 @@ celix_status_t framework_waitForStop(fra
 
 static void *framework_shutdown(void *framework) {
 	framework_pt fw = (framework_pt) framework;
-//	hash_map_values_pt values = NULL;
-//    bundle_pt **installedBundleArray;
-//    unsigned int size;
 	int err;
-//    int i;
 
 	fw_log(fw->logger, OSGI_FRAMEWORK_LOG_INFO, "FRAMEWORK: Shutdown");
 
 	hash_map_iterator_pt iter = hashMapIterator_create(fw->installedBundleMap);
 	bundle_pt bundle = NULL;
 	while ((bundle = hashMapIterator_nextValue(iter)) != NULL) {
-	    printf("Bundle: %p\n", bundle);
-//        bundle_pt bundle = (bundle_pt) installedBundleArray[i];
         bundle_state_e state;
         bundle_getState(bundle, &state);
         if (state == OSGI_FRAMEWORK_BUNDLE_ACTIVE || state == OSGI_FRAMEWORK_BUNDLE_STARTING)
{
@@ -1991,27 +1980,6 @@ static void *framework_shutdown(void *fr
         }
 	}
 
-
-//    values = hashMapValues_create(fw->installedBundleMap);
-//    hashMapValues_toArray(values, (void*) &installedBundleArray, &size);
-//
-//    for(i = 0; i < size; i++) {
-//	    bundle_pt bundle = (bundle_pt) installedBundleArray[i];
-//		bundle_state_e state;
-//		bundle_getState(bundle, &state);
-//		if (state == OSGI_FRAMEWORK_BUNDLE_ACTIVE || state == OSGI_FRAMEWORK_BUNDLE_STARTING)
{
-//			char *location;
-//			bundle_archive_pt archive = NULL;
-//
-//			bundle_getArchive(bundle, &archive);
-//			bundleArchive_getLocation(archive, &location);
-//
-//
-//
-//			fw_stopBundle(fw, bundle, 0);
-//		}
-//	}
-
 	err = celixThreadMutex_lock(&fw->mutex);
 	if (err != 0) {
 		fw_log(fw->logger, OSGI_FRAMEWORK_LOG_ERROR,  "Error locking the framework, cannot exit
clean.");

Modified: celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1630030&r1=1630029&r2=1630030&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
Wed Oct  8 08:41:26 2014
@@ -347,7 +347,6 @@ celix_status_t remoteServiceAdmin_remove
     celix_status_t status = CELIX_SUCCESS;
     remote_service_admin_pt admin = registration->rsa;
 
-    printf("Remote export %p\n", registration->reference);
     hashMap_remove(admin->exportedServices, registration->reference);
 
     return status;



Mime
View raw message