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

benfry · benfry · commit 1f568b0d5fcb · 2018-05-02T11:03:12.000-04:00
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -4350,7 +4350,15 @@ public int compare(int index1, int index2) {
           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:
diff --git a/core/todo.txt b/core/todo.txt
@@ -10,6 +10,7 @@ X   sort only uses the sign of the value
 X   more accurate than float, especially when using double and long values
 X consistently implement write(PrintWriter) in the List and Dict classes
 X add save(File) to the List and Dict classes
+X prevent Table.sort() from throwing NPE with empty cells
 _ Dict.remove() should return value, not index (for consistency w/ others)
 _ check again whether element 0,0 in a Table is working
 _   https://github.com/processing/processing/issues/3011
