celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1632894 - in /celix/trunk/remote_services/discovery/private/src: discovery_activator.c endpoint_discovery_poller.c
Date Sun, 19 Oct 2014 11:57:07 GMT
Author: bpetri
Date: Sun Oct 19 11:57:07 2014
New Revision: 1632894

URL: http://svn.apache.org/r1632894
Log:
Minor bug fixes

Modified:
    celix/trunk/remote_services/discovery/private/src/discovery_activator.c
    celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c

Modified: celix/trunk/remote_services/discovery/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery/private/src/discovery_activator.c?rev=1632894&r1=1632893&r2=1632894&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery/private/src/discovery_activator.c (original)
+++ celix/trunk/remote_services/discovery/private/src/discovery_activator.c Sun Oct 19 11:57:07
2014
@@ -97,7 +97,7 @@ celix_status_t bundleActivator_start(voi
 	}
 
 	size_t len = 11 + strlen(OSGI_FRAMEWORK_OBJECTCLASS) + strlen(OSGI_RSA_ENDPOINT_FRAMEWORK_UUID)
+ strlen(uuid);
-	char *scope = malloc(len);
+	char *scope = malloc(len+1);
 	if (!scope) {
 		return CELIX_ENOMEM;
 	}

Modified: celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c?rev=1632894&r1=1632893&r2=1632894&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c (original)
+++ celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c Sun Oct
19 11:57:07 2014
@@ -246,6 +246,8 @@ static void *endpointDiscoveryPoller_pol
 			}
 		}
 
+		hashMapIterator_destroy(iterator);
+
 		status = celixThreadMutex_unlock(&poller->pollerLock);
 		if (status != CELIX_SUCCESS) {
 			fw_log(logger, OSGI_FRAMEWORK_LOG_WARNING, "ENDPOINT_POLLER: failed to release lock; retrying...");



Mime
View raw message