diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java index cc97755a..78dfc441 100644 --- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java +++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java @@ -336,8 +336,8 @@ public class BubbleConfiguration extends PgRestServerConfiguration private final AtomicReference> publicSystemConfigs = new AtomicReference<>(); public Map getPublicSystemConfigs () { - final var thisNetwork = getThisNetwork(); - final var awaitingRestore = thisNetwork != null && thisNetwork.getState() == BubbleNetworkState.restoring; + final BubbleNetwork thisNetwork = getThisNetwork(); + final boolean awaitingRestore = thisNetwork != null && thisNetwork.getState() == BubbleNetworkState.restoring; synchronized (publicSystemConfigs) { if (publicSystemConfigs.get() == null) { diff --git a/bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java b/bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java index 46d3f4f1..f2c1c3ef 100644 --- a/bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java +++ b/bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java @@ -68,10 +68,6 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase ((AbstractDAO) dao).getSearchView()); // } - // ensure system configs can be loaded properly - final Map configs = c.getPublicSystemConfigs(); - if (empty(configs)) die("onStart: no system configs found"); // should never happen - final AccountDAO accountDAO = c.getBean(AccountDAO.class); if (!accountDAO.activated()) { final File nodeFile = THIS_NODE_FILE; @@ -91,6 +87,10 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase configs = c.getPublicSystemConfigs(); + if (empty(configs)) die("onStart: no system configs found"); // should never happen + // start network monitor if we manage networks if (c.isSageLauncher()) c.getBean(NetworkMonitorService.class).start(); diff --git a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java index d00afe2e..4e46511e 100644 --- a/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java +++ b/bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java @@ -188,7 +188,7 @@ public class StandardSelfNodeService implements SelfNodeService { } } - private OneWayFlag nullWarningPrinted = new OneWayFlag("nullWarningPrinted"); + private final OneWayFlag nullWarningPrinted = new OneWayFlag("nullWarningPrinted"); public BubbleNode getThisNode () { synchronized (thisNode) { diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index e2783ac8..7716949a 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit e2783ac80f88f8b90ddca85fd7f0b487d3abaf47 +Subproject commit 7716949a32c967ae62989d52745146b9cfcb8698