commit e1194345f85701844446de710597372e597003ac
author Sagar Miglani <saga@adobe.com> Mon Jan 31 20:12:24 2022 +0530
committer Sagar Miglani <saga@adobe.com> Mon Jan 31 20:12:24 2022 +0530
tree d19172d7e8e94383d253f1da41bdaebdf499c42a
parent 788c7770ecfcff1c84ccf5a554edf4da07be4051

SLING-11103 - Use AtomicBoolean instead of sync block

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 b3aa40a..74ed1a7 100644
--- a/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java
+++ b/src/main/java/org/apache/sling/rewriter/impl/TransformerFactoryServiceTracker.java
@@ -17,6 +17,7 @@
 package org.apache.sling.rewriter.impl;
 
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.sling.rewriter.ProcessingContext;
 import org.apache.sling.rewriter.TransformerFactory;
@@ -50,7 +51,7 @@
     private TransformerFactoryEntry[][] cached = EMPTY_DOUBLE_ENTRY_ARRAY;
 
     /** flag for cache. */
-    private volatile boolean cacheIsValid = true;
+    private AtomicBoolean cacheIsValid = new AtomicBoolean(true);
 
     public TransformerFactoryServiceTracker(final BundleContext bc, final String serviceClassName) {
         super(bc, serviceClassName);
@@ -63,15 +64,12 @@
     public Object addingService(ServiceReference reference) {
         final boolean isGlobal = isGlobal(reference);
         LOGGER.debug("Adding service {}, isGlobal={}", reference.getClass(), isGlobal);
-        Object obj = null;
-        synchronized (this) {
-            if ( isGlobal ) {
-                this.cacheIsValid = false;
-            }
-            obj = super.addingService(reference);
-            if ( obj == null && isGlobal ) {
-                obj = this.context.getService(reference);
-            }
+        Object obj = super.addingService(reference);
+        if ( obj == null && isGlobal ) {
+            obj = this.context.getService(reference);
+        }
+        if ( isGlobal ) {
+            this.cacheIsValid.set(false);
         }
         return obj;
     }
@@ -83,11 +81,9 @@
     public void removedService(ServiceReference reference, Object service) {
         final boolean isGlobal = isGlobal(reference);
         LOGGER.debug("Removing service {}, isGlobal={}", reference.getClass(), isGlobal);
-        synchronized (this) {
-            if ( isGlobal ) {
-                this.cacheIsValid = false;
-            }
-            super.removedService(reference, service);
+        super.removedService(reference, service);
+        if ( isGlobal ) {
+            this.cacheIsValid.set(false);
         }
     }
 
@@ -96,9 +92,9 @@
      * @return Two arrays of transformer factories
      */
     public TransformerFactoryEntry[][] getGlobalTransformerFactoryEntries() {
-        if ( !this.cacheIsValid ) {
+        if ( !this.cacheIsValid.get() ) {
             synchronized ( this ) {
-                if ( !this.cacheIsValid ) {
+                if ( !this.cacheIsValid.get() ) {
                     final ServiceReference[] refs = this.getServiceReferences();
                     LOGGER.debug("Found {} service references", refs.length);
                     if ( refs == null || refs.length == 0 ) {
@@ -146,7 +142,7 @@
                         this.cached = globalFactories;
                     }
                 }
-                this.cacheIsValid = true;
+                this.cacheIsValid.set(true);
             }
         }