From commits-return-4506-archive-asf-public=cust-asf.ponee.io@celix.apache.org Tue Jan 30 20:19:03 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id AF46918067A for ; Tue, 30 Jan 2018 20:19:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9F1C1160C62; Tue, 30 Jan 2018 19:19:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 39AB6160C54 for ; Tue, 30 Jan 2018 20:19:00 +0100 (CET) Received: (qmail 13827 invoked by uid 500); 30 Jan 2018 19:18:59 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 13431 invoked by uid 99); 30 Jan 2018 19:18:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2018 19:18:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BB25F4DD5; Tue, 30 Jan 2018 19:18:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Tue, 30 Jan 2018 19:19:25 -0000 Message-Id: In-Reply-To: <1b421c6c690a4bc49fda2e206ddf3a76@git.apache.org> References: <1b421c6c690a4bc49fda2e206ddf3a76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] celix git commit: Fix for publisher/subscriber without properties 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 Authored: Fri Dec 15 18:34:10 2017 +0100 Committer: Roy Lenferink 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;