Merge pull request #94 from OpenHFT/issue/93-warn-dont-throw

log warning instead of throw exception for too high cpuId. Closes #93

Author: JerryShea

affinity/src/main/java/net/openhft/affinity/LockInventory.java

@@ -126,6 +126,12 @@ public final synchronized AffinityLock acquireLock(boolean bind, int cpuId, Affi
         final boolean specificCpuRequested = !isAnyCpu(cpuId);
         try {
             if (specificCpuRequested && cpuId != 0) {
+                if (cpuId > logicalCoreLocks.length) {
+                    LOGGER.warn("Unable to acquire lock on CPU {} for thread {}, as not enough CPUs",
+                            cpuId, Thread.currentThread());
+                    return noLock();
+                }
+
                 final AffinityLock required = logicalCoreLocks[cpuId];
                 if (required.canReserve(true)
                         && anyStrategyMatches(cpuId, cpuId, strategies)
@@ -162,7 +168,8 @@ && updateLockForCurrentThread(bind, al, false)) {
     public final synchronized AffinityLock tryAcquireLock(boolean bind, int cpuId) {
         if (getAffinityImpl() instanceof NullAffinity)
             return null;
-
+        if (cpuId > logicalCoreLocks.length)
+            return null;
         final AffinityLock required = logicalCoreLocks[cpuId];
         try {
             if (required.canReserve(true)

affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java

@@ -296,4 +296,16 @@ public void testAffinityLockDescriptions() {
             assertFalse(lock.bound);
         }
     }
+
+    @Test
+    public void testTooHighCpuId() {
+        try (AffinityLock ignored = AffinityLock.acquireLock(123456)) {
+        }
+    }
+
+    @Test
+    public void testTooHighCpuId2() {
+        try (AffinityLock ignored = AffinityLock.acquireLock(new int[] {123456})) {
+        }
+    }
 }