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 6E66E1841A for ; Thu, 12 Nov 2015 16:40:51 +0000 (UTC) Received: (qmail 87422 invoked by uid 500); 12 Nov 2015 16:40:51 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 87377 invoked by uid 500); 12 Nov 2015 16:40:51 -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 87234 invoked by uid 99); 12 Nov 2015 16:40:51 -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; Thu, 12 Nov 2015 16:40:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03883E5E23; Thu, 12 Nov 2015 16:40:51 +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: Thu, 12 Nov 2015 16:40:55 -0000 Message-Id: <2ba8311ce68e417e9ea31c7f7093bc4a@git.apache.org> In-Reply-To: <686edd2ffc28429ba77f4d6d0173a2bb@git.apache.org> References: <686edd2ffc28429ba77f4d6d0173a2bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] celix git commit: CELIX-272: Fix in incorrect call to bundleContext_ungetService from service_tracker. CELIX-272: Fix in incorrect call to bundleContext_ungetService from service_tracker. Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/1836ed49 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/1836ed49 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/1836ed49 Branch: refs/heads/feature/CELIX-272_synchronization_service_registry Commit: 1836ed49794033d599d78af76440ea8b6d377e5d Parents: e651c8a Author: Pepijn Noltes Authored: Thu Nov 12 17:37:11 2015 +0100 Committer: Pepijn Noltes Committed: Thu Nov 12 17:40:27 2015 +0100 ---------------------------------------------------------------------- framework/private/src/service_tracker.c | 2 +- remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/1836ed49/framework/private/src/service_tracker.c ---------------------------------------------------------------------- diff --git a/framework/private/src/service_tracker.c b/framework/private/src/service_tracker.c index b5edbd6..23db0aa 100644 --- a/framework/private/src/service_tracker.c +++ b/framework/private/src/service_tracker.c @@ -346,7 +346,7 @@ static celix_status_t serviceTracker_untrack(service_tracker_pt tracker, service if (equals) { arrayList_remove(tracker->tracked, i); serviceTracker_invokeRemovingService(tracker, tracked->reference, tracked->service); - bundleContext_ungetService(tracker->context, tracked->reference, tracked->service); + bundleContext_ungetService(tracker->context, tracked->reference, NULL); free(tracked); break; } http://git-wip-us.apache.org/repos/asf/celix/blob/1836ed49/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt index e666e92..99d6a23 100644 --- a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt +++ b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt @@ -32,7 +32,7 @@ SET(CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/framework" "${PROJECT_BINARY_DIR} add_executable(test_rsa_dfi run_tests.cpp - #rsa_tests.cpp + rsa_tests.cpp rsa_client_server_tests.cpp ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c