Skip to content

Commit 0fe0bd4

Browse files
committed
Add null-check to AbstractTableViewer and AbstractTreeViewer
Check for null before using the result of getViewerColumn(int). The JavaDoc explicitly says that the method may return null and other places in the code are already checking for null.
1 parent 4f7b636 commit 0fe0bd4

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,11 @@ protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
387387
}
388388

389389
ViewerColumn columnViewer = getViewerColumn(column);
390-
ViewerCell cellToUpdate = new ViewerCell(viewerRowFromItem, column, element);
391390

392-
columnViewer.refresh(cellToUpdate);
391+
if (columnViewer != null) {
392+
ViewerCell cellToUpdate = new ViewerCell(viewerRowFromItem, column, element);
393+
columnViewer.refresh(cellToUpdate);
394+
}
393395

394396
// As it is possible for user code to run the event
395397
// loop check here.

bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,9 +994,11 @@ protected void doUpdateItem(final Item item, Object element) {
994994
}
995995

996996
ViewerColumn columnViewer = getViewerColumn(column);
997-
ViewerCell cellToUpdate = new ViewerCell(viewerRowFromItem, column, element);
998997

999-
columnViewer.refresh(cellToUpdate);
998+
if (columnViewer != null) {
999+
ViewerCell cellToUpdate = new ViewerCell(viewerRowFromItem, column, element);
1000+
columnViewer.refresh(cellToUpdate);
1001+
}
10001002

10011003
// As it is possible for user code to run the event
10021004
// loop check here.

0 commit comments

Comments
 (0)