Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1EDB19C30 for ; Mon, 11 Apr 2016 12:00:16 +0000 (UTC) Received: (qmail 23100 invoked by uid 500); 11 Apr 2016 12:00:11 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 23032 invoked by uid 500); 11 Apr 2016 12:00:11 -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 22255 invoked by uid 99); 11 Apr 2016 12:00:11 -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; Mon, 11 Apr 2016 12:00:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B468E050B; Mon, 11 Apr 2016 12:00:11 +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: Mon, 11 Apr 2016 12:00:56 -0000 Message-Id: <9ea09da4f4a74301b871a140b83edb15@git.apache.org> In-Reply-To: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> References: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] celix git commit: CELIX-272: Added missing properties for importing services CELIX-272: Added missing properties for importing services Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/f741eb4f Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/f741eb4f Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/f741eb4f Branch: refs/heads/master Commit: f741eb4f816df066c6a8e81d9a22b25cc8339f24 Parents: e6ebebb Author: Pepijn Noltes Authored: Wed Mar 9 16:37:41 2016 +0100 Committer: Pepijn Noltes Committed: Wed Mar 9 16:37:41 2016 +0100 ---------------------------------------------------------------------- .../rsa/private/src/import_registration_dfi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/f741eb4f/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c index ee1dbbf..2507ea8 100644 --- a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c +++ b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c @@ -142,7 +142,9 @@ void importRegistration_destroy(import_registration_pt import) { celix_status_t importRegistration_start(import_registration_pt import) { celix_status_t status = CELIX_SUCCESS; if (import->factoryReg == NULL && import->factory != NULL) { - status = bundleContext_registerServiceFactory(import->context, (char *)import->classObject, import->factory, NULL /*TODO*/, &import->factoryReg); + properties_pt props = NULL; + properties_copy(import->endpoint->properties, &props); + status = bundleContext_registerServiceFactory(import->context, (char *)import->classObject, import->factory, props, &import->factoryReg); } else { status = CELIX_ILLEGAL_STATE; }