From f4ce0d50bd629379e0498513f432c4836d0abf2f Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Fri, 10 Apr 2020 10:40:53 +0200 Subject: [PATCH 1/3] Fix NPE while processing exception in new node creatorO --- .../java/bubble/service/cloud/StandardNetworkService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java index 0c1a8667..46cb3ebf 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java @@ -34,6 +34,7 @@ import bubble.service.notify.NotificationService; import com.github.jknack.handlebars.Handlebars; import lombok.Cleanup; import lombok.Getter; +import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.apache.commons.exec.CommandLine; import org.cobbzilla.util.handlebars.HandlebarsUtil; @@ -129,7 +130,7 @@ public class StandardNetworkService implements NetworkService { @Getter(lazy=true) private final RedisService networkLocks = redisService.prefixNamespace(getClass().getSimpleName()+"_lock_"); @Getter(lazy=true) private final RedisService networkSetupStatus = redisService.prefixNamespace(getClass().getSimpleName()+"_status_"); - public BubbleNode newNode(NewNodeNotification nn) { + @NonNull public BubbleNode newNode(@NonNull final NewNodeNotification nn) { log.info("newNode starting:\n"+json(nn)); ComputeServiceDriver computeDriver = null; BubbleNode node = null; @@ -378,8 +379,7 @@ public class StandardNetworkService implements NetworkService { progressMeter.error(METER_UNKNOWN_ERROR); killNode(node, "error: "+e); } else { - // fixme: NPE is inevitable here - final BubbleNetwork network = networkDAO.findByUuid(node.getNetwork()); + final BubbleNetwork network = networkDAO.findByUuid(nn.getNetwork()); if (noNodesActive(network)) { // if no nodes are running, then the network is stopped networkDAO.update(network.setState(BubbleNetworkState.stopped)); From 28ced48853f907d952691dee1b0ca6dfd122b6e1 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Fri, 10 Apr 2020 11:06:14 +0200 Subject: [PATCH 2/3] Add missing device in the test model --- bubble-server/src/test/resources/models/manifest-all.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/test/resources/models/manifest-all.json b/bubble-server/src/test/resources/models/manifest-all.json index 55c226d3..d2d9be8a 100644 --- a/bubble-server/src/test/resources/models/manifest-all.json +++ b/bubble-server/src/test/resources/models/manifest-all.json @@ -1,4 +1,5 @@ [ "manifest-live", + "system/account_testDevice", "manifest-app-user-block-localhost" -] \ No newline at end of file +] From 9bec480b041c5972da4b266a775ba454db76fdcc Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 11 Apr 2020 14:54:36 -0400 Subject: [PATCH 3/3] update ui --- bubble-web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bubble-web b/bubble-web index 941801fb..b602ed10 160000 --- a/bubble-web +++ b/bubble-web @@ -1 +1 @@ -Subproject commit 941801fb12f115f326c06702b3672982b5abe5e5 +Subproject commit b602ed1011328cf185865e53c2fb1ce5c266b961