github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7688] NPE in MockResultSet.withTZ() methods

Browse Source
This commit is contained in:
lukaseder 2018-07-30 11:35:18 +02:00
parent e09979901a
commit 245a4f19c9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java
View File

@ -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();