From bc591b019c0dd1be33e6a4ce6b17f7f163e9e543 Mon Sep 17 00:00:00 2001
From: Husain Bardanwala <24ce202@gmail.com>
Date: Thu, 29 Oct 2026 20:28:10 +0530
Subject: [PATCH 1/2] fix: load JDBC driver before DriverManager.getConnection
 in Setup (#1082)

---
 src/main/java/servlets/Setup.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/servlets/Setup.java b/src/main/java/servlets/Setup.java
index 4ab92c591..99addaecb 100644
--- a/src/main/java/servlets/Setup.java
+++ b/src/main/java/servlets/Setup.java
@@ -216,10 +216,16 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
           testJdbcUrl = connectionURL + "?connectTimeout=5000";
         }
 
-        try (Connection conn = DriverManager.getConnection(testJdbcUrl, dbUser, dbPass)) {
-          connectionSuccess = true;
-          log.debug("Database connection successful");
+        try {
+          Class.forName(driverType);
 
+          try (Connection conn = DriverManager.getConnection(testJdbcUrl, dbUser, dbPass)) {
+            connectionSuccess = true;
+            log.debug("Database connection successful");
+          }
+        } catch (ClassNotFoundException e) {
+          log.error("Could not load JDBC driver: " + driverType, e);
+          htmlOutput += bundle.getString("generic.text.setup.connection.failed") + ": Could not load JDBC driver";
         } catch (SQLException e) {
           htmlOutput += bundle.getString("generic.text.setup.connection.failed") + e.getMessage();
 

From b5b74b30857d4f06920458143dda3c5518f84f3f Mon Sep 17 00:00:00 2001
From: Husain Bardanwala <24ce202@gmail.com>
Date: Sat, 31 Oct 2026 19:59:17 +0530
Subject: [PATCH 2/2] style: wrap overlong error message to satisfy spotless
 (#1082)

---
 src/main/java/servlets/Setup.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/servlets/Setup.java b/src/main/java/servlets/Setup.java
index b96c510d8..95a57ab84 100644
--- a/src/main/java/servlets/Setup.java
+++ b/src/main/java/servlets/Setup.java
@@ -225,7 +225,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
           }
         } catch (ClassNotFoundException e) {
           log.error("Could not load JDBC driver: " + driverType, e);
-          htmlOutput += bundle.getString("generic.text.setup.connection.failed") + ": Could not load JDBC driver";
+          htmlOutput =
+              bundle.getString("generic.text.setup.connection.failed")
+                  + ": Could not load JDBC driver";
         } catch (SQLException e) {
           htmlOutput += bundle.getString("generic.text.setup.connection.failed") + e.getMessage();