From 245a4f19c95e2af97855ebf6662689e7b0c5851b Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 30 Jul 2018 11:35:18 +0200 Subject: [PATCH] [#7688] NPE in MockResultSet.withTZ() methods --- .../src/main/java/org/jooq/tools/jdbc/MockResultSet.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java index 6656fd27f3..ca974c46c0 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java @@ -179,6 +179,9 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali @SuppressWarnings("deprecation") private Timestamp withTZ(Timestamp timestamp, Calendar cal) { + if (timestamp == null) + return null; + int year = timestamp.getYear() + 1900; int month = timestamp.getMonth(); int day = timestamp.getDate(); @@ -196,6 +199,9 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali @SuppressWarnings("deprecation") private Time withTZ(Time time, Calendar cal) { + if (time == null) + return null; + int hour = time.getHours(); int minute = time.getMinutes(); int second = time.getSeconds(); @@ -206,6 +212,9 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali @SuppressWarnings("deprecation") private Date withTZ(Date date, Calendar cal) { + if (date == null) + return null; + int year = date.getYear() + 1900; int month = date.getMonth(); int day = date.getDate();