rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

PluggableDiscovery: BoardPort.label sanity check in the correct place

Browse Source
This commit is contained in:
Cristian Maglie 2018-11-30 12:06:23 +01:00
parent 4c188c9374
commit 4ae740ad66
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java
View File

@ -173,6 +173,10 @@ public class PluggableDiscovery implements Discovery {
private BoardPort mapJsonNodeToBoardPort(ObjectMapper mapper, JsonNode node) { private BoardPort mapJsonNodeToBoardPort(ObjectMapper mapper, JsonNode node) {
try { try {
BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class); BoardPort port = mapper.treeToValue(node.get("port"), BoardPort.class);
// if no label, use address
if (port.getLabel() == null || port.getLabel().isEmpty()) {
port.setLabel(port.getAddress());
}
port.searchMatchingBoard(); port.searchMatchingBoard();
return port; return port;
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
@ -256,10 +260,6 @@ public class PluggableDiscovery implements Discovery {
// if address already on the list, discard old info // if address already on the list, discard old info
portList.removeIf(bp -> address.equals(bp.getAddress())); portList.removeIf(bp -> address.equals(bp.getAddress()));
// if no label, use address
if (port.getLabel() == null) {
port.setLabel(address);
}
portList.add(port); portList.add(port);
} }