commit e0b40d2e63e89c1262956299efd0d2ebc4536c0d
author Sagar Miglani <saga@adobe.com> Tue Feb 01 13:01:25 2022 +0530
committer Sagar Miglani <saga@adobe.com> Tue Feb 01 13:01:25 2022 +0530
tree f06ae82bafe51f76d9ebd532fc4c6b419c8ae84e
parent 762f1632d1023d503b10d06eedae808d87e4e3b8

SLING-11103 - Use getTrackingCount

src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java

diff --git a/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java b/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java
index 125498c..ae7082f 100644
--- a/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java
+++ b/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java
@@ -49,11 +49,12 @@
 
     private TransformerFactoryEntry[][] cached = EMPTY_DOUBLE_ENTRY_ARRAY;
 
-    /** flag for cache. */
-    private volatile boolean cacheIsValid = true;
+    /** flag for tracking cache updates. */
+    private volatile int currentTrackingCount;
 
     public TransformerFactoryServiceTracker(final BundleContext bc, final String serviceClassName) {
         super(bc, serviceClassName);
+        this.currentTrackingCount = super.getTrackingCount();
     }
 
     /**
@@ -68,11 +69,6 @@
         if ( obj == null && isGlobal ) {
             obj = this.context.getService(reference);
         }
-        synchronized (this) {
-            if ( isGlobal ) {
-                this.cacheIsValid = false;
-            }
-        }
         return obj;
     }
 
@@ -84,11 +80,6 @@
         final boolean isGlobal = isGlobal(reference);
         LOGGER.debug("Removing service {}, isGlobal={}", reference.getClass(), isGlobal);
         super.removedService(reference, service);
-        synchronized (this) {
-            if ( isGlobal ) {
-                this.cacheIsValid = false;
-            }
-        }
     }
 
     /**
@@ -96,9 +87,9 @@
      * @return Two arrays of transformer factories
      */
     public TransformerFactoryEntry[][] getGlobalTransformerFactoryEntries() {
-        if ( !this.cacheIsValid ) {
+        if (this.currentTrackingCount != this.getTrackingCount()) {
             synchronized ( this ) {
-                if ( !this.cacheIsValid ) {
+                if (this.currentTrackingCount != this.getTrackingCount()) {
                     final ServiceReference[] refs = this.getServiceReferences();
                     LOGGER.debug("Found {} service references", refs.length);
                     if ( refs == null || refs.length == 0 ) {
@@ -145,8 +136,8 @@
                         }
                         this.cached = globalFactories;
                     }
+                    this.currentTrackingCount = this.getTrackingCount();
                 }
-                this.cacheIsValid = true;
             }
         }