From 32df7102387b93618c5974b003f6df1586ed67ab Mon Sep 17 00:00:00 2001 From: Hellblazer Date: Sat, 9 Mar 2024 17:42:38 -0800 Subject: [PATCH] no reuse of forks. handle new epochs after produce. --- .../main/java/com/salesforce/apollo/choam/fsm/Genesis.java | 5 +++++ .../apollo/archipelago/server/ServerInterceptorTest.java | 1 + pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java b/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java index a10398187..3db3858a5 100644 --- a/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java +++ b/choam/src/main/java/com/salesforce/apollo/choam/fsm/Genesis.java @@ -82,6 +82,11 @@ public Transitions process(List preblock, boolean last) { public void publish() { context().publish(); } + + @Override + public Transitions nextEpoch(Integer epoch) { + return null; + } } } diff --git a/memberships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java b/memberships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java index db7d7f73e..e255a7078 100644 --- a/memberships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java +++ b/memberships/src/test/java/com/salesforce/apollo/archipelago/server/ServerInterceptorTest.java @@ -68,6 +68,7 @@ public void closesCallOnInvalidToken() { Metadata metadata = new Metadata(); metadata.put(Constants.AuthorizationMetadataKey, "Bearer Invalid Token"); target.interceptCall(serverCall, metadata, next); + System.out.println("\n\n*** Exception above expected ***\n"); verify(serverCall).close(any(), any()); verify(next, never()).startCall(any(), any()); } diff --git a/pom.xml b/pom.xml index 7ae212872..e86b336c5 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ 3.17.2 1.74 1.4.12 - 1.61.0 - 3.25.2 + 1.62.2 + 3.25.3 4.8.0 4.1.100.Final 0.9.27 @@ -779,7 +779,7 @@ 3.1.2 ${forks} - true + false