eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

prevent Table.sort() from throwing NPE with empty cells

Browse Source
This commit is contained in:
Ben Fry
2018-05-02 11:03:12 -04:00
parent 91c1aa4665
commit eb8f0edd4d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/processing/data/Table.java
View File

@@ -4350,7 +4350,15 @@ public class Table {
double diffd = getDouble(a, column) - getDouble(b, column);
return diffd == 0 ? 0 : (diffd < 0 ? -1 : 1);
case STRING:
return getString(a, column).compareToIgnoreCase(getString(b, column));
String string1 = getString(a, column);
if (string1 == null) {
string1 = ""; // avoid NPE when cells are left empty
}
String string2 = getString(b, column);
if (string2 == null) {
string2 = "";
}
return string1.compareToIgnoreCase(string2);
case CATEGORY:
return getInt(a, column) - getInt(b, column);
default: