Skip to content

Commit 41ed40f

Browse files
committed
Remove java.lang classes and NonForkingAffinityLock to support Java 12+, Fixes #58
1 parent a73913c commit 41ed40f

File tree

4 files changed

+4
-291
lines changed

4 files changed

+4
-291
lines changed

affinity/src/main/java/java/lang/ThreadLifecycleListener.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

affinity/src/main/java/java/lang/ThreadTrackingGroup.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,24 +198,19 @@ public static boolean isJNAAvailable() {
198198
}
199199

200200
public static AffinityLock acquireLock() {
201-
return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock() : AffinityLock.acquireLock();
201+
return AffinityLock.acquireLock();
202202
}
203203

204204
public static AffinityLock acquireCore() {
205-
return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireCore() : AffinityLock.acquireCore();
205+
return AffinityLock.acquireCore();
206206
}
207207

208208
public static AffinityLock acquireLock(boolean bind) {
209-
return isNonForkingAffinityAvailable() ? NonForkingAffinityLock.acquireLock(bind) : AffinityLock.acquireLock(bind);
209+
return AffinityLock.acquireLock(bind);
210210
}
211211

212212
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);
219214
}
220215

221216
public static void resetToBaseAffinity() {

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

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)