Fix NPE when loading cloudwatch log streams with no last event timestamp (#3009)

rli · web-flow · commit 9c34d7d358f1 · 2021-12-14T11:39:15.000-08:00
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt
@@ -54,7 +54,7 @@ class LogStreamsDateColumn(
 
     override fun isCellEditable(item: LogStream?): Boolean = false
     override fun getRenderer(item: LogStream?): TableCellRenderer = renderer
-    override fun getComparator(): Comparator<LogStream>? = if (sortable) Comparator.comparing { it.lastEventTimestamp() } else null
+    override fun getComparator(): Comparator<LogStream>? = if (sortable) Comparator.comparing { it.lastEventTimestamp() ?: Long.MIN_VALUE } else null
 }
 
 class LogStreamDateColumn(private val format: SyncDateFormat? = null) : ColumnInfo<LogStreamEntry, String>(message("general.time")) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class LogStreamsDateColumn(`
`54`	`54`
`55`	`55`	`override fun isCellEditable(item: LogStream?): Boolean = false`
`56`	`56`	`override fun getRenderer(item: LogStream?): TableCellRenderer = renderer`
`57`		`- override fun getComparator(): Comparator<LogStream>? = if (sortable) Comparator.comparing { it.lastEventTimestamp() } else null`
	`57`	`+ override fun getComparator(): Comparator<LogStream>? = if (sortable) Comparator.comparing { it.lastEventTimestamp() ?: Long.MIN_VALUE } else null`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`class LogStreamDateColumn(private val format: SyncDateFormat? = null) : ColumnInfo<LogStreamEntry, String>(message("general.time")) {`