From bc9bd09d245b4c8d1866691e200dcbbac9b61e90 Mon Sep 17 00:00:00 2001
From: Harkamal Randhawa <harkamalsr@gmail.com>
Date: Fri, 13 Mar 2026 14:18:34 -0600
Subject: [PATCH] Keep original startup error message

---
 .../com/petshop/backend/DevStackApplication.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/petshop/backend/DevStackApplication.java b/src/main/java/com/petshop/backend/DevStackApplication.java
index 4fd47ffc..38846aaa 100644
--- a/src/main/java/com/petshop/backend/DevStackApplication.java
+++ b/src/main/java/com/petshop/backend/DevStackApplication.java
@@ -25,6 +25,7 @@ public class DevStackApplication {
         CountDownLatch shutdownLatch = new CountDownLatch(1);
         ScheduledExecutorService scheduler = null;
         AtomicBoolean shuttingDown = new AtomicBoolean(false);
+        RuntimeException startupFailure = null;
 
         try {
             validateJavaVersion();
@@ -42,6 +43,7 @@ public class DevStackApplication {
             scheduler = startDatabaseWatch(docker, context, shuttingDown);
             shutdownLatch.await();
         } catch (RuntimeException ex) {
+            startupFailure = ex;
             throw new IllegalStateException(describeStartupFailure(ex), ex);
         } catch (InterruptedException ex) {
             Thread.currentThread().interrupt();
@@ -54,7 +56,15 @@ public class DevStackApplication {
                 context.close();
             }
             if (!shuttingDown.get()) {
-                docker.stopDatabase();
+                try {
+                    docker.stopDatabase();
+                } catch (RuntimeException stopFailure) {
+                    if (startupFailure != null) {
+                        System.err.println(stopFailure.getMessage());
+                    } else {
+                        throw stopFailure;
+                    }
+                }
             }
         }
     }