Merge branch 'dev' into feature/QQQ-38-app-home-widgets

2025-07-20 14:10:44 +00:00 · 2022-08-25 10:14:26 -05:00
parent 459a533f60 c3bba7cf8c
commit d32538bf45
41 changed files with 1273 additions and 410 deletions
--- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
+++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
@ -198,6 +198,12 @@ public class QJavalinImplementation
         try
         {
            QInstance newQInstance = qInstanceHotSwapSupplier.get();
+            if(newQInstance == null)
+            {
+               LOG.warn("Got a null qInstance from hotSwapSupplier.  Not hot-swapping.");
+               return;
+            }
+
            new QInstanceValidator().validate(newQInstance);
            QJavalinImplementation.qInstance = newQInstance;
            LOG.info("Swapped qInstance");