(celix) branch feature/509-remove-osgi-defines updated: #509: Fix wrong replace of get svc id to svc pid

[pnoltes]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/509-remove-osgi-defines
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/509-remove-osgi-defines by this push:
     new 63cb6def #509: Fix wrong replace of get svc id to svc pid
63cb6def is described below

commit 63cb6defb281dd9252a1b437cb470f8bf2112a35
Author: Pepijn Noltes <pnol...@apache.org>
AuthorDate: Sat Oct 28 17:11:32 2023 +0200

    #509: Fix wrong replace of get svc id to svc pid
---
 .../bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc 
b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
index 84b3b7dd..09fa1902 100644
--- a/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
+++ b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
@@ -212,7 +212,7 @@ void pubsub_nanomsg_admin::stop() {
 
 void pubsub_nanomsg_admin::addSerializerSvc(void *svc, const 
celix_properties_t *props) {
     const char *serType = celix_properties_get(props, 
PUBSUB_SERIALIZER_TYPE_KEY, nullptr);
-    long svcId = celix_properties_getAsLong(props, 
CELIX_FRAMEWORK_SERVICE_PID, -1L);
+    long svcId = celix_properties_getAsLong(props, CELIX_FRAMEWORK_SERVICE_ID, 
-1L);
 
     if (serType == nullptr) {
         L.INFO("[PSA_NANOMSG] Ignoring serializer service without ", 
PUBSUB_SERIALIZER_TYPE_KEY, " property");
@@ -232,7 +232,7 @@ void pubsub_nanomsg_admin::addSerializerSvc(void *svc, 
const celix_properties_t
 
 
 void pubsub_nanomsg_admin::removeSerializerSvc(void */*svc*/, const 
celix_properties_t *props) {
-    long svcId = celix_properties_getAsLong(props, 
CELIX_FRAMEWORK_SERVICE_PID, -1L);
+    long svcId = celix_properties_getAsLong(props, CELIX_FRAMEWORK_SERVICE_ID, 
-1L);
 
     //remove serializer
     // 1) First find entry and