Continue even if /proc/cpuinfo is "unusual" (as sometimes seen on LXC or virtual environments) OpenHFT#59

JerryShea · JerryShea · commit 01b1d63e33f2 · 2020-04-17T13:45:51.000+10:00
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -26,7 +26,6 @@
 
 import java.io.Closeable;
 import java.io.File;
-import java.io.IOException;
 import java.util.BitSet;
 
 /**
@@ -56,7 +55,7 @@ public class AffinityLock implements Closeable {
                 cpuLayout = VanillaCpuLayout.fromCpuInfo();
                 processors = cpuLayout.cpus();
             }
-        } catch (IOException e) {
+        } catch (Throwable e) {
             LOGGER.warn("Unable to load /proc/cpuinfo", e);
         }
         PROCESSORS = processors;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`import java.io.Closeable;`
`28`	`28`	`import java.io.File;`
`29`		`-import java.io.IOException;`
`30`	`29`	`import java.util.BitSet;`
`31`	`30`
`32`	`31`	`/**`
`@@ -56,7 +55,7 @@ public class AffinityLock implements Closeable {`
`56`	`55`	`cpuLayout = VanillaCpuLayout.fromCpuInfo();`
`57`	`56`	`processors = cpuLayout.cpus();`
`58`	`57`	`}`
`59`		`- } catch (IOException e) {`
	`58`	`+ } catch (Throwable e) {`
`60`	`59`	`LOGGER.warn("Unable to load /proc/cpuinfo", e);`
`61`	`60`	`}`
`62`	`61`	`PROCESSORS = processors;`