Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master 3dae7ed72 -> 29a02c704
Fix bug that prevented filters from unregistering Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/ee7b13c7 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ee7b13c7 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ee7b13c7 Branch: refs/heads/master Commit: ee7b13c7cbdedd07e08046e1c17fe99cdb7ad9be Parents: 3dae7ed Author: Carlos Sierra <csie...@apache.org> Authored: Thu Dec 1 11:35:47 2016 +0100 Committer: Carlos Sierra <csie...@apache.org> Committed: Thu Dec 1 11:35:47 2016 +0100 ---------------------------------------------------------------------- .../FiltersAndInterceptorsServiceTrackerCustomizer.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee7b13c7/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java index 0635c64..71c8725 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/FiltersAndInterceptorsServiceTrackerCustomizer.java @@ -77,19 +77,17 @@ public class FiltersAndInterceptorsServiceTrackerCustomizer @Override public void modifiedService( ServiceReference<CXFJaxRsServiceRegistrator> reference, - CXFJaxRsServiceRegistrator service) { + CXFJaxRsServiceRegistrator serviceRegistrator) { - removedService(reference, service); + removedService(reference, serviceRegistrator); addingService(reference); } @Override public void removedService( ServiceReference<CXFJaxRsServiceRegistrator> reference, - CXFJaxRsServiceRegistrator service) { + CXFJaxRsServiceRegistrator serviceRegistrator) { - CXFJaxRsServiceRegistrator serviceRegistrator = - _bundleContext.getService(reference); try { serviceRegistrator.removeProvider(service); }
