HHH-17344 - Fix potential NPE

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
hibernate · Oct 30, 2023 · 17771de · 17771de
1 parent 634f21b
commit 17771de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java
@@ -237,7 +237,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 
 	@Override
 	public String rowId(String rowId) {
-		return rowId.isEmpty() ? "rowid_" : rowId;
+		return rowId == null || rowId.isEmpty() ? "rowid_" : rowId;
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
@@ -158,7 +158,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 
 	@Override
 	public String rowId(String rowId) {
-		return rowId.isEmpty() ? "rowid_" : rowId;
+		return rowId == null || rowId.isEmpty() ? "rowid_" : rowId;
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
@@ -226,7 +226,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 
 	@Override
 	public String rowId(String rowId) {
-		return rowId.isEmpty() ? "rowid_" : rowId;
+		return rowId == null || rowId.isEmpty() ? "rowid_" : rowId;
 	}
 
 	@Override