celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1623914 - /celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
Date Wed, 10 Sep 2014 06:03:03 GMT
Author: bpetri
Date: Wed Sep 10 06:03:03 2014
New Revision: 1623914

URL: http://svn.apache.org/r1623914
Log:

CELIX-140: adapted code to use correct properties


Modified:
    celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c?rev=1623914&r1=1623913&r2=1623914&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
Wed Sep 10 06:03:03 2014
@@ -935,14 +935,12 @@ celix_status_t remoteServiceAdmin_create
     }
     else
     {
-        char *uuid = NULL;
-        status = bundleContext_getProperty(admin->context, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID,
&uuid);
         if (status == CELIX_SUCCESS)
         {
             (*description)->properties = endpointProperties;
-            (*description)->frameworkUUID = uuid;
+            (*description)->frameworkUUID = properties_get(endpointProperties, (char*)
OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
             (*description)->serviceId = apr_atoi64(properties_get(serviceProperties, (char
*) OSGI_FRAMEWORK_SERVICE_ID));
-            (*description)->id = properties_get(endpointProperties, (char *) OSGI_RSA_SERVICE_LOCATION);
// TODO this should be a UUID!
+            (*description)->id = properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID);
             (*description)->service = interface;
         }
     }



Mime
View raw message