OAK-11429: mvn test -Prdb-db2 -Dnsfixtures=DOCUMENT_RDB -Drdb.jdbc-url=jdbc:db2://localhost:50000/OAK -Drdb.jdbc-user=oak -Drdb.jdbc-passwd=geheim -Drdb.docker-image=icr.io/db2_community/db2:11.5.9.0 -Drdb.docker-env='LICENSE=accept,DB2INSTANCE=oak,DB2INST1_PASSWORD=geheim,DBNAME=oak' -Dmax.jar.size=200000000 -Doak.skipMongo -Dtest=CacheConsistencyRDBTest

Manfred Baedke · Manfred Baedke · commit 5038420b2588 · 2025-02-06T11:58:42.000+01:00
Improved connection validity check.
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RdbConnectionUtils.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RdbConnectionUtils.java
@@ -87,7 +87,7 @@ public class RdbConnectionUtils {
                 for (int k = 0; k < 30 && !containerReady; k++) {
                     Thread.sleep(10000);
                     try (Connection connection = dataSource.getConnection()) {
-                        if (!connection.isClosed()) {
+                        if (connection.isValid(10)) {
                             containerReady = true;
                         }
                     } catch (SQLException expected) {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public class RdbConnectionUtils {`
`87`	`87`	`for (int k = 0; k < 30 && !containerReady; k++) {`
`88`	`88`	`Thread.sleep(10000);`
`89`	`89`	`try (Connection connection = dataSource.getConnection()) {`
`90`		`- if (!connection.isClosed()) {`
	`90`	`+ if (connection.isValid(10)) {`
`91`	`91`	`containerReady = true;`
`92`	`92`	`}`
`93`	`93`	`} catch (SQLException expected) {`