4819544: SwingSet2 JTable Demo throws NullPointerException

Backport-of: 64d18d45ef885d5cdd893b7f56236d3f22b4b84c
openjdk · Nov 5, 2021 · 9a2c123 · 9a2c123 · openjdk-notifier · Nov 5, 2021
1 parent 0ab99ed
commit 9a2c123
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/demo/share/jfc/SwingSet2/TableDemo.java b/src/demo/share/jfc/SwingSet2/TableDemo.java
@@ -549,7 +549,10 @@ public JScrollPane createTable() {
             public int getRowCount() { return data.length;}
             public Object getValueAt(int row, int col) {return data[row][col];}
             public String getColumnName(int column) {return names[column];}
-            public Class<?> getColumnClass(int c) {return getValueAt(0, c).getClass();}
+            public Class<?> getColumnClass(int c) {
+                Object obj = getValueAt(0, c);
+                return obj != null ? obj.getClass() : Object.class;
+            }
             public boolean isCellEditable(int row, int col) {return col != 5;}
             public void setValueAt(Object aValue, int row, int column) { data[row][column] = aValue; }
          };