From dcb72d353c8de8b977021067183b80b83de1b739 Mon Sep 17 00:00:00 2001 From: Jeff Butler Date: Fri, 9 Jun 2023 17:05:56 -0400 Subject: [PATCH 1/2] Null check --- .../util/spring/NamedParameterJdbcTemplateExtensions.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java b/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java index 43e972157..250825c35 100644 --- a/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java +++ b/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java @@ -54,7 +54,10 @@ public long count(Buildable countStatement) { } public long count(SelectStatementProvider countStatement) { - return template.queryForObject(countStatement.getSelectStatement(), countStatement.getParameters(), Long.class); + Long answer = template.queryForObject(countStatement.getSelectStatement(), + countStatement.getParameters(), Long.class); + + return answer == null ? 0L : answer; } public int delete(Buildable deleteStatement) { From c340a3cf6ddc193364521651df6c1ed939322da1 Mon Sep 17 00:00:00 2001 From: Jeff Butler Date: Fri, 9 Jun 2023 17:42:11 -0400 Subject: [PATCH 2/2] JDK 21-ea is Broken --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97a1e0ec6..5502fd6c4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [11, 17, 20, 21-ea] + java: [11, 17, 20] distribution: ['zulu'] fail-fast: false max-parallel: 5