prevent state transition errors on failure

salesforce · Jun 11, 2024 · 889e7d5 · 889e7d5
1 parent 3530674
commit 889e7d5
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 2 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java
@@ -361,11 +361,11 @@ public void stop() {
         }
         session.cancelAll();
         try {
-            linear.shutdown();
+            linear.shutdownNow();
         } catch (Throwable e) {
         }
         try {
-            executions.shutdown();
+            executions.shutdownNow();
         } catch (Throwable e) {
         }
         final var c = current.get();

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/fsm/Combine.java b/choam/src/main/java/com/salesforce/apollo/choam/fsm/Combine.java
@@ -110,6 +110,71 @@ public Transitions rotateViewKeys() {
             public void failIt() {
                 context().fail();
             }
+
+            @Override
+            public Transitions beginCheckpoint() {
+                return null;
+            }
+
+            @Override
+            public Transitions bootstrap(HashedCertifiedBlock anchor) {
+                return null;
+            }
+
+            @Override
+            public Transitions combine() {
+                return null;
+            }
+
+            @Override
+            public Transitions fail() {
+                return null;
+            }
+
+            @Override
+            public Transitions finishCheckpoint() {
+                return null;
+            }
+
+            @Override
+            public Transitions nextView() {
+                return null;
+            }
+
+            @Override
+            public Transitions regenerate() {
+                return null;
+            }
+
+            @Override
+            public Transitions regenerated() {
+                return null;
+            }
+
+            @Override
+            public Transitions rotateViewKeys() {
+                return null;
+            }
+
+            @Override
+            public Transitions start() {
+                return null;
+            }
+
+            @Override
+            public Transitions synchd() {
+                return null;
+            }
+
+            @Override
+            public Transitions synchronizationFailed() {
+                return null;
+            }
+
+            @Override
+            public Transitions synchronizing() {
+                return null;
+            }
         }, RECOVERING {
             @Override
             public Transitions bootstrap(HashedCertifiedBlock anchor) {