Merge remote-tracking branch 'origin/4.2.x' into 4.2.x

liquibase · Dec 9, 2020 · a5a01b5 · a5a01b5
2 parents 6250ef5 + 23e0d1c
commit a5a01b5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/database/core/CockroachDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/CockroachDatabase.java
@@ -33,11 +33,13 @@ protected String getDefaultDatabaseProductName() {
     @Override
     public boolean isCorrectDatabaseImplementation(DatabaseConnection conn) throws DatabaseException {
         if (conn instanceof JdbcConnection) {
-            try (Statement stmt = ((JdbcConnection) conn).createStatement();
-                 ResultSet rs = stmt.executeQuery("select version()")
-            ) {
-                if (rs.next()) {
-                    return ((String) JdbcUtils.getResultSetValue(rs, 1)).startsWith("CockroachDB");
+            try (Statement stmt = ((JdbcConnection) conn).createStatement()) {
+                if (stmt != null) {
+                    try (ResultSet rs = stmt.executeQuery("select version()")) {
+                        if (rs.next()) {
+                            return ((String) JdbcUtils.getResultSetValue(rs, 1)).startsWith("CockroachDB");
+                        }
+                    }
                 }
             } catch (SQLException throwables) {
                 return false;