celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [29/50] [abbrv] celix git commit: Fix for publisher/subscriber without properties
Date Tue, 30 Jan 2018 19:19:25 GMT
Fix for publisher/subscriber without properties


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b1667160
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b1667160
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b1667160

Branch: refs/heads/master
Commit: b1667160e0e35116217f4dda677e0fb56bd24a10
Parents: 49e25fa
Author: Roy Lenferink <lenferinkroy@gmail.com>
Authored: Fri Dec 15 18:34:10 2017 +0100
Committer: Roy Lenferink <lenferinkroy@gmail.com>
Committed: Fri Dec 15 18:34:10 2017 +0100

----------------------------------------------------------------------
 pubsub/pubsub_common/public/src/pubsub_admin_match.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/b1667160/pubsub/pubsub_common/public/src/pubsub_admin_match.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_common/public/src/pubsub_admin_match.c b/pubsub/pubsub_common/public/src/pubsub_admin_match.c
index bb555b7..1e821b5 100644
--- a/pubsub/pubsub_common/public/src/pubsub_admin_match.c
+++ b/pubsub/pubsub_common/public/src/pubsub_admin_match.c
@@ -165,8 +165,13 @@ celix_status_t pubsub_admin_get_best_serializer(properties_pt endpoint_props,
ar
 
 	int i = 0, j = 0;
 
-	const char *requested_serializer_type 	= properties_get(endpoint_props,PUBSUB_SERIALIZER_TYPE_KEY);
-	const char *requested_qos_type			= properties_get(endpoint_props,QOS_ATTRIBUTE_KEY);
+	const char *requested_serializer_type = NULL;
+	const char *requested_qos_type = NULL;
+
+	if (endpoint_props != NULL){
+		requested_serializer_type = properties_get(endpoint_props,PUBSUB_SERIALIZER_TYPE_KEY);
+		requested_qos_type = properties_get(endpoint_props,QOS_ATTRIBUTE_KEY);
+	}
 
 	service_reference_pt svcRef = NULL;
 	void *svc = NULL;


Mime
View raw message