1 files changed, 7 insertions, 9 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
index 4061298cd0..6b3452734e 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncWatchdog.java
@@ -92,16 +92,14 @@ public class ModuleSyncWatchdog {
     }
 
     private void populateWorkQueueIfNeeded() {
-        if (moduleSyncWorkQueue.isEmpty()) {
-            if (workQueueLock.tryLock()) {
-                try {
-                    populateWorkQueue();
-                    if (moduleSyncWorkQueue.isEmpty()) {
-                        setPreviouslyLockedCmHandlesToAdvised();
-                    }
-                } finally {
-                    workQueueLock.unlock();
+        if (moduleSyncWorkQueue.isEmpty() && workQueueLock.tryLock()) {
+            try {
+                populateWorkQueue();
+                if (moduleSyncWorkQueue.isEmpty()) {
+                    setPreviouslyLockedCmHandlesToAdvised();
                 }
+            } finally {
+                workQueueLock.unlock();
             }
         }
     }