rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Fix NPE when replacing unexisting strings

Browse Source
This commit is contained in:
Martino Facchin 2016-01-25 18:29:25 +01:00
parent 34b0813530
commit 42ff604f1e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arduino-core/src/processing/app/helpers/StringReplacer.java
View File

@ -94,7 +94,9 @@ public class StringReplacer {
String rightDelimiter) { String rightDelimiter) {
for (Map.Entry<String, String> entry : map.entrySet()) { for (Map.Entry<String, String> entry : map.entrySet()) {
String keyword = leftDelimiter + entry.getKey() + rightDelimiter; String keyword = leftDelimiter + entry.getKey() + rightDelimiter;
src = src.replace(keyword, entry.getValue()); if (entry.getValue() != null && keyword != null) {
src = src.replace(keyword, entry.getValue());
}
} }
return src; return src;
} }