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

[wpilibj] Shuffleboard: Check for null sendable (#4772)

Browse Source 
Adding a null sendable to a container could result in a delayed NullPointerException.
This commit is contained in:
Peter Johnson
2022-12-06 21:14:09 -08:00
committed by GitHub
parent 4bbdbdfb48
commit be27171236
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java
View File

@@ -10,6 +10,7 @@ import edu.wpi.first.networktables.NetworkTableType;
import edu.wpi.first.util.function.FloatSupplier;
import edu.wpi.first.util.sendable.Sendable;
import edu.wpi.first.util.sendable.SendableRegistry;
import edu.wpi.first.wpilibj.util.ErrorMessages;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -57,6 +58,7 @@ final class ContainerHelper {
}
ComplexWidget add(String title, Sendable sendable) {
ErrorMessages.requireNonNullParam(sendable, "sendable", "add");
checkTitle(title);
ComplexWidget widget = new ComplexWidget(m_container, title, sendable);
m_components.add(widget);
@@ -64,6 +66,7 @@ final class ContainerHelper {
}
ComplexWidget add(Sendable sendable) {
ErrorMessages.requireNonNullParam(sendable, "sendable", "add");
String name = SendableRegistry.getName(sendable);
if (name.isEmpty()) {
throw new IllegalArgumentException("Sendable must have a name");