commit 47552d7c9855505918bf6df07f46e16f2cc59a23
author David Jencks <djencks@apache.org> Mon Mar 18 20:55:06 2013 +0000
committer David Jencks <djencks@apache.org> Mon Mar 18 20:55:06 2013 +0000
tree 5c9e210346daf079d3fc0ebd033cc7732a224371
parent 22af12f59eef22f4217856d441558cf19015deb6

FELIX-3971 simplify tracker tracking

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1457988 13f79535-47bb-0310-9956-ffa450edef68

scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 1651472..c7ae8b1 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -168,26 +168,24 @@
     {
         private final Map<ServiceReference<T>, RefPair<T>> EMPTY_REF_MAP = Collections.emptyMap();
 
-        private ServiceTracker<T, RefPair<T>> tracker;
-
         private volatile boolean trackerOpened;
 
         private volatile Map<ServiceReference<T>, RefPair<T>> previousRefMap = EMPTY_REF_MAP;
 
         public void setTracker( ServiceTracker<T, RefPair<T>> tracker )
         {
-            this.tracker = tracker;
+            trackerRef.set( tracker );
             trackerOpened = false;
         }
 
         public boolean isSatisfied()
         {
-            return isOptional() || !tracker.isEmpty();
+            return isOptional() || !getTracker().isEmpty();
         }
 
         protected ServiceTracker<T, RefPair<T>> getTracker()
         {
-            return tracker;
+            return trackerRef.get();
         }
 
         /**
@@ -196,7 +194,7 @@
          */
         protected boolean isActive()
         {
-            return tracker.isActive();
+            return getTracker().isActive();
         }
 
         protected boolean isTrackerOpened()
@@ -1774,7 +1772,6 @@
         boolean initialActive = oldTracker != null && oldTracker.isActive();
         ServiceTracker<T, RefPair<T>> tracker = new ServiceTracker<T, RefPair<T>>( m_componentManager.getActivator().getBundleContext(), m_targetFilter, customizer, initialActive );
         customizer.setTracker( tracker );
-        trackerRef.set( tracker );
         registered = true;
         tracker.open( m_componentManager.getTrackingCount() );
         customizer.setTrackerOpened();