# HG changeset patch
# User wenzelm
# Date 1493846468 -7200
# Node ID aa9a7a753296ba6972297c34f460086edbc93251
# Parent  cead65c19f2e6d7f8fd291238c51f53ae985e50d
more robust;

diff -r cead65c19f2e -r aa9a7a753296 src/Pure/General/sql.scala
--- a/src/Pure/General/sql.scala	Wed May 03 23:04:25 2017 +0200
+++ b/src/Pure/General/sql.scala	Wed May 03 23:21:08 2017 +0200
@@ -428,7 +428,10 @@
       else stmt.setObject(i, OffsetDateTime.from(date.to_utc.rep))
 
     def date(rs: ResultSet, column: SQL.Column): Date =
-      Date.instant(rs.getObject(column.name, classOf[OffsetDateTime]).toInstant)
+    {
+      val obj = rs.getObject(column.name, classOf[OffsetDateTime])
+      if (obj == null) null else Date.instant(obj.toInstant)
+    }
 
     def insert_permissive(table: SQL.Table, sql: String = ""): String =
       table.insert_cmd("INSERT",