You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2015/11/12 17:40:55 UTC
[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 <pe...@gmail.com>
Authored: Thu Nov 12 17:37:11 2015 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
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