Author: abroekhuis
Date: Wed Jul 27 08:40:28 2011
New Revision: 1151379
URL: http://svn.apache.org/viewvc?rev=1151379&view=rev
Log:
Fixed merge problems
Modified:
incubator/celix/trunk/framework/private/src/framework.c
Modified: incubator/celix/trunk/framework/private/src/framework.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1151379&r1=1151378&r2=1151379&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed Jul 27 08:40:28
2011
@@ -714,68 +714,6 @@ celix_status_t fw_stopBundle(FRAMEWORK f
framework_setBundleStateAndNotify(framework, bundle,
BUNDLE_RESOLVED);
-=======
- switch (bundle_getState(bundle)) {
-=======
->>>>>>> Fixed broken build
- case BUNDLE_UNINSTALLED:
- printf("Cannot stop bundle since it is
uninstalled.");
- framework_releaseBundleLock(framework, bundle);
- return status;
- case BUNDLE_STARTING:
- printf("Cannot stop bundle since it is
starting.");
- framework_releaseBundleLock(framework, bundle);
- return status;
- case BUNDLE_STOPPING:
- printf("Cannot stop bundle since it is
stopping.");
- framework_releaseBundleLock(framework, bundle);
- return status;
- case BUNDLE_INSTALLED:
- case BUNDLE_RESOLVED:
- framework_releaseBundleLock(framework, bundle);
- return status;
- case BUNDLE_ACTIVE:
- // only valid state
- break;
- }
-
- 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, context);
- }
-
- if (activator->destroy != NULL) {
- activator->destroy(activator->userData, context);
- }
-
- if (strcmp(module_getId(bundle_getCurrentModule(bundle)), "0")
!= 0) {
- activator->start = NULL;
- activator->stop = NULL;
- activator->userData = NULL;
- //free(activator);
- bundle_setActivator(bundle, NULL);
-
- serviceRegistry_unregisterServices(framework->registry,
bundle);
- serviceRegistry_ungetServices(framework->registry,
bundle);
-
- dlclose(bundle_getHandle(bundle));
- }
-
- bundleContext_destroy(context);
- bundle_setContext(bundle, NULL);
-
- MANIFEST manifest = NULL;
- bundle_getManifest(bundle, &manifest);
-
- manifest_destroy(manifest);
-
- framework_setBundleStateAndNotify(framework, bundle,
BUNDLE_RESOLVED);
-
->>>>>>> Updated error handling, fixed a bug in the dependency manager
framework_releaseBundleLock(framework, bundle);
}
