Remove java.lang classes and NonForkingAffinityLock to support Java 1…

…2+, Fixes #58
OpenHFT · May 26, 2021 · 41ed40f · 41ed40f
1 parent a73913c
commit 41ed40f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 291 deletions.
diff --git a/affinity/src/main/java/java/lang/ThreadLifecycleListener.java b/affinity/src/main/java/java/lang/ThreadLifecycleListener.java
diff --git a/affinity/src/main/java/java/lang/ThreadTrackingGroup.java b/affinity/src/main/java/java/lang/ThreadTrackingGroup.java
diff --git a/affinity/src/main/java/net/openhft/affinity/Affinity.java b/affinity/src/main/java/net/openhft/affinity/Affinity.java
@@ -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() {

diff --git a/affinity/src/main/java/net/openhft/affinity/NonForkingAffinityLock.java b/affinity/src/main/java/net/openhft/affinity/NonForkingAffinityLock.java