Handle no affinity more gracefully.

peter-lawrey · peter-lawrey · commit 96d7475db467 · 2019-12-16T16:53:21.000Z
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -17,13 +17,16 @@
 
 package net.openhft.affinity;
 
+import net.openhft.affinity.impl.NullAffinity;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
+import static net.openhft.affinity.Affinity.getAffinityImpl;
+
 class LockInventory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LockInventory.class);
@@ -97,6 +100,9 @@ public final synchronized void set(CpuLayout cpuLayout) {
     }
 
     public final synchronized AffinityLock acquireLock(boolean bind, int cpuId, AffinityStrategy... strategies) {
+        if (getAffinityImpl() instanceof NullAffinity)
+            return noLock();
+
         final boolean specificCpuRequested = !isAnyCpu(cpuId);
         if (specificCpuRequested && cpuId != 0) {
             final AffinityLock required = logicalCoreLocks[cpuId];
