Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilibj] Make CallbackStore.close() idempotent (#6666)

Browse Source 
This is "strongly recommended" in the javadocs for the AutoCloseable.close().
This commit is contained in:
Dean Brettle
2024-05-27 07:58:03 -07:00
committed by GitHub
parent a6ac4228c3
commit 3b8d8a367b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java
View File

@@ -69,6 +69,7 @@ public class CallbackStore implements AutoCloseable {
private CancelCallbackFunc m_cancelCallback;
private CancelCallbackChannelFunc m_cancelCallbackChannel;
private CancelCallbackNoIndexFunc m_cancelCallbackNoIndex;
private static final int kAlreadyCancelled = -1;
private static final int kNormalCancel = 0;
private static final int kChannelCancel = 1;
private static final int kNoIndexCancel = 2;
@@ -78,6 +79,9 @@ public class CallbackStore implements AutoCloseable {
@Override
public void close() {
switch (m_cancelType) {
case kAlreadyCancelled:
// Already cancelled so do nothing so that close() is idempotent.
return;
case kNormalCancel:
m_cancelCallback.cancel(m_index, m_uid);
break;
@@ -91,6 +95,6 @@ public class CallbackStore implements AutoCloseable {
assert false;
break;
}
m_cancelType = -1;
m_cancelType = kAlreadyCancelled;
}
}