celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1311634 - in /incubator/celix/trunk: framework/private/src/filter.c framework/private/src/framework.c framework/private/src/service_registration.c remote_services/discovery/private/src/discovery_activator.c
Date Tue, 10 Apr 2012 08:36:21 GMT
Author: abroekhuis
Date: Tue Apr 10 08:36:20 2012
New Revision: 1311634

URL: http://svn.apache.org/viewvc?rev=1311634&view=rev
Log:
Small bugfixes

Several small bugfixes

Modified:
    incubator/celix/trunk/framework/private/src/filter.c
    incubator/celix/trunk/framework/private/src/framework.c
    incubator/celix/trunk/framework/private/src/service_registration.c
    incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c

Modified: incubator/celix/trunk/framework/private/src/filter.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/filter.c?rev=1311634&r1=1311633&r2=1311634&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/filter.c (original)
+++ incubator/celix/trunk/framework/private/src/filter.c Tue Apr 10 08:36:20 2012
@@ -351,8 +351,8 @@ char * filter_parseValue(char * filterSt
 			case '\\': {
 				(*pos)++;
 				c = filterString[*pos];
-				// nb
 			}
+			/* no break */
 			default: {
 				char ch[2];
 				ch[0] = c;
@@ -407,8 +407,8 @@ ARRAY_LIST filter_parseSubstring(char * 
 			case '\\': {
 				(*pos)++;
 				c = filterString[*pos];
-				//no break
 			}
+			/* no break */
 			default: {
 				char ch[2];
 				ch[0] = c;
@@ -550,8 +550,8 @@ int filter_compareString(OPERAND operand
 		case NOT:
 		case OR:
 		case PRESENT: {
-			//no break
 		}
+		/* no break */
 	}
 	return 0;
 }

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1311634&r1=1311633&r2=1311634&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Tue Apr 10 08:36:20 2012
@@ -611,7 +611,7 @@ celix_status_t fw_startBundle(FRAMEWORK 
                 framework_markResolvedModules(framework, wires);
 		    }
 			hashMap_destroy(wires, false, false);
-			// nb
+			/* no break */
 		case BUNDLE_RESOLVED:
 			if (bundleContext_create(framework, bundle, &context) != CELIX_SUCCESS) {
 				return CELIX_ENOMEM;

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=1311634&r1=1311633&r2=1311634&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registration.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registration.c Tue Apr 10 08:36:20
2012
@@ -31,10 +31,14 @@
 #include "service_factory.h"
 #include "service_reference.h"
 
+struct service {
+	char *name;
+	void *serviceStruct;
+};
+
 struct serviceRegistration {
 	SERVICE_REGISTRY registry;
 	char * className;
-	// SERVICE_REFERENCE reference;
 	ARRAY_LIST references;
 	BUNDLE bundle;
 	PROPERTIES properties;
@@ -46,6 +50,9 @@ struct serviceRegistration {
 
 	bool isServiceFactory;
 	void *serviceFactory;
+
+	struct service *services;
+	int nrOfServices;
 };
 
 celix_status_t serviceRegistration_createInternal(apr_pool_t *pool, SERVICE_REGISTRY registry,
BUNDLE bundle, char * serviceName, long serviceId,

Modified: incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c?rev=1311634&r1=1311633&r2=1311634&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c Tue
Apr 10 08:36:20 2012
@@ -47,6 +47,7 @@ celix_status_t bundleActivator_create(BU
 	} else {
 		activator->pool = pool;
 		activator->context = context;
+		activator->endpointListenerTracker = NULL;
 
 		discovery_create(pool, context, &activator->discovery);
 



Mime
View raw message