QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
darin.kelkhoff
2022-08-25 10:14:26 -05:00
parent 459a533f60 c3bba7cf8c
commit d32538bf45
41 changed files with 1273 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
View File

@ -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");

2
qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java
View File

@ -51,7 +51,7 @@ import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData;
import org.apache.commons.io.IOUtils;
import static junit.framework.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/*******************************************************************************