HHH-17344 - Fix potential NPE

jrenaat · mbellade · commit 47cd06c6db41 · 2024-07-02T08:46:40.000+02:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/hibernate-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

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`237`	`237`
`238`	`238`	`@Override`
`239`	`239`	`public String rowId(String rowId) {`
`240`		`- return rowId.isEmpty() ? "rowid_" : rowId;`
	`240`	`+ return rowId == null \|\| rowId.isEmpty() ? "rowid_" : rowId;`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`158`	`158`
`159`	`159`	`@Override`
`160`	`160`	`public String rowId(String rowId) {`
`161`		`- return rowId.isEmpty() ? "rowid_" : rowId;`
	`161`	`+ return rowId == null \|\| rowId.isEmpty() ? "rowid_" : rowId;`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(`
`226`	`226`
`227`	`227`	`@Override`
`228`	`228`	`public String rowId(String rowId) {`
`229`		`- return rowId.isEmpty() ? "rowid_" : rowId;`
	`229`	`+ return rowId == null \|\| rowId.isEmpty() ? "rowid_" : rowId;`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`@Override`