arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Also SerialDiscovery was affected by bug found at 40535dfc55. Fixes #2892

Browse Source
This commit is contained in:
Federico Fissore
2015-04-13 13:38:55 +02:00
parent 40535dfc55
commit 350adb99cb
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
View File

@ -55,6 +55,10 @@ public class SerialBoardsLister extends TimerTask {
@Override @Override
public void run() { public void run() {
if (BaseNoGui.packages == null) {
return;
}
Platform platform = BaseNoGui.getPlatform(); Platform platform = BaseNoGui.getPlatform();
if (platform == null) { if (platform == null) {
return; return;

1
arduino-core/src/processing/app/linux/Platform.java
View File

@ -122,6 +122,7 @@ public class Platform extends processing.app.Platform {
@Override @Override
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) { public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
assert packages != null;
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
Executor executor = new CollectStdOutExecutor(baos); Executor executor = new CollectStdOutExecutor(baos);

1
arduino-core/src/processing/app/macosx/Platform.java
View File

@ -191,6 +191,7 @@ public class Platform extends processing.app.Platform {
@Override @Override
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) { public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
assert packages != null;
if (devicesListOutput == null) { if (devicesListOutput == null) {
return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput); return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
} }

1
arduino-core/src/processing/app/windows/Platform.java
View File

@ -286,6 +286,7 @@ public class Platform extends processing.app.Platform {
@Override @Override
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) { public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
assert packages != null;
if (devicesListOutput == null) { if (devicesListOutput == null) {
return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput); return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
} }