pauldintel
diff --git a/‎affinity/src/main/java/java/lang/ThreadLifecycleListener.java‎
Lines changed: 0 additions & 45 deletions b/‎affinity/src/main/java/java/lang/ThreadLifecycleListener.java‎
Lines changed: 0 additions & 45 deletions
diff --git a/‎affinity/src/main/java/java/lang/ThreadTrackingGroup.java‎
Lines changed: 0 additions & 53 deletions b/‎affinity/src/main/java/java/lang/ThreadTrackingGroup.java‎
Lines changed: 0 additions & 53 deletions
diff --git a/‎affinity/src/main/java/net/openhft/affinity/Affinity.java‎
Lines changed: 4 additions & 9 deletions b/‎affinity/src/main/java/net/openhft/affinity/Affinity.java‎
Lines changed: 4 additions & 9 deletions
diff --git a/‎affinity/src/main/java/net/openhft/affinity/NonForkingAffinityLock.java‎
Lines changed: 0 additions & 184 deletions b/‎affinity/src/main/java/net/openhft/affinity/NonForkingAffinityLock.java‎
Lines changed: 0 additions & 184 deletions
@@ -198,24 +198,19 @@ public static boolean isJNAAvailable() {
     }
 
     public static AffinityLock acquireLock() {
-        return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock() : AffinityLock.acquireLock();
+        return AffinityLock.acquireLock();
     }
 
     public static AffinityLock acquireCore() {
-        return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireCore() : AffinityLock.acquireCore();
+        return AffinityLock.acquireCore();
     }
 
     public static AffinityLock acquireLock(boolean bind) {
-        return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock(bind) : AffinityLock.acquireLock(bind);
+        return AffinityLock.acquireLock(bind);
     }
 
     public static AffinityLock acquireCore(boolean bind) {
-        return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireCore(bind) : AffinityLock.acquireCore(bind);
-    }
-
-    private static boolean isNonForkingAffinityAvailable() {
-        BootClassPath bootClassPath = BootClassPath.INSTANCE;
-        return bootClassPath.has("java.lang.ThreadTrackingGroup") && bootClassPath.has("java.lang.ThreadLifecycleListener");
+        return AffinityLock.acquireCore(bind);
     }
 
     public static void resetToBaseAffinity() {
Original file line number	Diff line number	Diff line change
`@@ -198,24 +198,19 @@ public static boolean isJNAAvailable() {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`public static AffinityLock acquireLock() {`
`201`		`- return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock() : AffinityLock.acquireLock();`
	`201`	`+ return AffinityLock.acquireLock();`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`public static AffinityLock acquireCore() {`
`205`		`- return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireCore() : AffinityLock.acquireCore();`
	`205`	`+ return AffinityLock.acquireCore();`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`public static AffinityLock acquireLock(boolean bind) {`
`209`		`- return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock(bind) : AffinityLock.acquireLock(bind);`
	`209`	`+ return AffinityLock.acquireLock(bind);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`public static AffinityLock acquireCore(boolean bind) {`
`213`		`- return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireCore(bind) : AffinityLock.acquireCore(bind);`
`214`		`- }`
`215`		`-`
`216`		`- private static boolean isNonForkingAffinityAvailable() {`
`217`		`- BootClassPath bootClassPath = BootClassPath.INSTANCE;`
`218`		`- return bootClassPath.has("java.lang.ThreadTrackingGroup") && bootClassPath.has("java.lang.ThreadLifecycleListener");`
	`213`	`+ return AffinityLock.acquireCore(bind);`
`219`	`214`	`}`
`220`	`215`
`221`	`216`	`public static void resetToBaseAffinity() {`