Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* A JUnit rule that ensures that changes to preferences done by a test are not leaked out to other
* tests.
*/
public final class IsolatedPreferences extends ExternalResource {
final class IsolatedPreferences extends ExternalResource {
private NetworkTableInstance tempInstance;

/** Gets the {@link NetworkTable} that contains the preference values. */
Expand All @@ -42,9 +42,9 @@ protected void before() {

@Override
protected void after() {
if (!tempInstance.waitForListenerQueue(.1)) {
if (!tempInstance.waitForListenerQueue(.2)) {
System.err.println(
"Timed out waiting for the NetworkTableInstance listener queue to empty (waited 100ms);"
"Timed out waiting for the NetworkTableInstance listener queue to empty (waited 200ms);"
+ " JVM may crash");
}
Preferences.setNetworkTableInstance(NetworkTableInstance.getDefault());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ public final class IsolatedNetworkTablesExtension
@Override
public void afterEach(ExtensionContext context) {
// If this extension created a temporary NetworkTableInstance, close it.
var ntInstance = NETWORK_TABLE_INSTANCE_KEY.get(getStore(context));
var ntInstance = NETWORK_TABLE_INSTANCE_KEY.remove(getStore(context));
if (ntInstance != null) {
// Clear out the listener queue before destroying our temporary NetworkTableInstance.
//
// This works around a race condition in WPILib where a listener registered by Preferences can
// be called after the NetworkTableInstance was closed (see
// https://github.com/wpilibsuite/allwpilib/issues/8215).
if (!ntInstance.waitForListenerQueue(.1)) {
if (!ntInstance.waitForListenerQueue(.2)) {
System.err.println(
"Timed out waiting for the NetworkTableInstance listener queue to empty (waited 100ms);"
"Timed out waiting for the NetworkTableInstance listener queue to empty (waited 200ms);"
+ " JVM may crash");
}

Expand Down
Loading