CELIX-351: Moved remove service listener after untracking service in …

…service tracker. This ensure service reference are still valid during untracking.
apache · Feb 12, 2016 · b990dde · b990dde
1 parent 9434821
commit b990dde
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/cmake/CMakeCelix.cmake b/cmake/CMakeCelix.cmake
@@ -31,3 +31,4 @@ include(cmake_celix/PackagingLegacy)
 #include(cmake_celix/Test)
 include(cmake_celix/ApacheRat)
 include(cmake_celix/CodeCoverage)
+include(cmake_celix/BuildOptions)
diff --git a/cmake/cmake_celix/BuildOptions.cmake b/cmake/cmake_celix/BuildOptions.cmake
@@ -0,0 +1,7 @@
+
+option(ENABLE_ADDRESS_SANITIZER "Enabled building with address sanitizer. Note for gcc libasan must be installed" OFF)
+
+if (ENABLE_ADDRESS_SANITIZER)
+    set(CMAKE_C_FLAGS "-lasan -fsanitize=address ${CMAKE_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-lasan -fsanitize=address ${CMAKE_CXX_FLAGS}")
+endif()
diff --git a/framework/private/src/service_reference.c b/framework/private/src/service_reference.c
@@ -191,7 +191,9 @@ celix_status_t serviceReference_getOwner(service_reference_pt ref, bundle_pt *ow
 
 celix_status_t serviceReference_getServiceRegistration(service_reference_pt ref, service_registration_pt *out) {
     celixThreadRwlock_readLock(&ref->lock);
-    *out = ref->registration;
+    if (ref != NULL) {
+        *out = ref->registration;
+    }
     celixThreadRwlock_unlock(&ref->lock);
     return CELIX_SUCCESS;
 }

diff --git a/framework/private/src/service_tracker.c b/framework/private/src/service_tracker.c
@@ -148,7 +148,6 @@ celix_status_t serviceTracker_open(service_tracker_pt tracker) {
 celix_status_t serviceTracker_close(service_tracker_pt tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	status = bundleContext_removeServiceListener(tracker->context, tracker->listener);
 	if (status == CELIX_SUCCESS) {
 		array_list_pt refs = serviceTracker_getServiceReferences(tracker);
 		if (refs != NULL) {
@@ -160,6 +159,9 @@ celix_status_t serviceTracker_close(service_tracker_pt tracker) {
 		}
 		arrayList_destroy(refs);
 	}
+    if (status == CELIX_SUCCESS) {
+        status = bundleContext_removeServiceListener(tracker->context, tracker->listener);
+    }
 
 	framework_logIfError(logger, status, NULL, "Cannot close tracker");