incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1151378 - in /incubator/celix/trunk/framework/private: include/bundle.h src/framework.c
Date Wed, 27 Jul 2011 08:38:49 GMT
Author: abroekhuis
Date: Wed Jul 27 08:38:48 2011
New Revision: 1151378

URL: http://svn.apache.org/viewvc?rev=1151378&view=rev
Log:
Fixed broken build

Modified:
    incubator/celix/trunk/framework/private/include/bundle.h
    incubator/celix/trunk/framework/private/src/framework.c

Modified: incubator/celix/trunk/framework/private/include/bundle.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle.h?rev=1151378&r1=1151377&r2=1151378&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle.h Wed Jul 27 08:38:48 2011
@@ -70,11 +70,7 @@ ARRAY_LIST getUsingBundles(SERVICE_REFER
 int compareTo(SERVICE_REFERENCE a, SERVICE_REFERENCE b);
 
 
-<<<<<<< HEAD
 celix_status_t bundle_getState(BUNDLE bundle, BUNDLE_STATE *state);
-=======
-BUNDLE_STATE bundle_getState(BUNDLE bundle);
->>>>>>> Updated error handling, fixed a bug in the dependency manager
 celix_status_t bundle_isLockable(BUNDLE bundle, bool *lockable);
 celix_status_t bundle_getLockingThread(BUNDLE bundle, apr_os_thread_t *thread);
 celix_status_t bundle_lock(BUNDLE bundle, bool *locked);

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1151378&r1=1151377&r2=1151378&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed Jul 27 08:38:48 2011
@@ -653,7 +653,6 @@ celix_status_t fw_stopBundle(FRAMEWORK f
 		//if (!fw_isBundlePersistentlyStarted(framework, bundle)) {
 		//}
 
-<<<<<<< HEAD
 		BUNDLE_STATE state;
 		bundle_getState(bundle, &state);
 
@@ -717,6 +716,8 @@ celix_status_t fw_stopBundle(FRAMEWORK f
 
 =======
 		switch (bundle_getState(bundle)) {
+=======
+>>>>>>> Fixed broken build
 			case BUNDLE_UNINSTALLED:
 				printf("Cannot stop bundle since it is uninstalled.");
 				framework_releaseBundleLock(framework, bundle);
@@ -741,12 +742,14 @@ celix_status_t fw_stopBundle(FRAMEWORK f
 		framework_setBundleStateAndNotify(framework, bundle, BUNDLE_STOPPING);
 
 		ACTIVATOR activator = bundle_getActivator(bundle);
+		BUNDLE_CONTEXT context;
+		bundle_getContext(bundle, &context);
 		if (activator->stop != NULL) {
-			activator->stop(activator->userData, bundle_getContext(bundle));
+			activator->stop(activator->userData, context);
 		}
 
 		if (activator->destroy != NULL) {
-			activator->destroy(activator->userData, bundle_getContext(bundle));
+			activator->destroy(activator->userData, context);
 		}
 
 		if (strcmp(module_getId(bundle_getCurrentModule(bundle)), "0") != 0) {
@@ -762,9 +765,13 @@ celix_status_t fw_stopBundle(FRAMEWORK f
 			dlclose(bundle_getHandle(bundle));
 		}
 
-		bundleContext_destroy(bundle_getContext(bundle));
+		bundleContext_destroy(context);
 		bundle_setContext(bundle, NULL);
-		manifest_destroy(bundle_getManifest(bundle));
+
+		MANIFEST manifest = NULL;
+		bundle_getManifest(bundle, &manifest);
+
+		manifest_destroy(manifest);
 
 		framework_setBundleStateAndNotify(framework, bundle, BUNDLE_RESOLVED);
 
@@ -1313,13 +1320,9 @@ celix_status_t framework_acquireBundleLo
 		while (!lockable
 				|| ((framework->globalLockThread != NULL)
 				&& (framework->globalLockThread != pthread_self()))) {
-<<<<<<< HEAD
 			BUNDLE_STATE state;
 			bundle_getState(bundle, &state);
 			if ((desiredStates & state) == 0) {
-=======
-			if ((desiredStates & bundle_getState(bundle)) == 0) {
->>>>>>> Updated error handling, fixed a bug in the dependency manager
 				status = CELIX_ILLEGAL_STATE;
 				break;
 			} else
@@ -1341,13 +1344,9 @@ celix_status_t framework_acquireBundleLo
 		}
 
 		if (status == CELIX_SUCCESS) {
-<<<<<<< HEAD
 			BUNDLE_STATE state;
 			bundle_getState(bundle, &state);
 			if ((desiredStates & state) == 0) {
-=======
-			if ((desiredStates & bundle_getState(bundle)) == 0) {
->>>>>>> Updated error handling, fixed a bug in the dependency manager
 				status = CELIX_ILLEGAL_STATE;
 			} else {
 				if (bundle_lock(bundle, &locked)) {



Mime
View raw message