File riak_ensemble-2.1.8-catch.patch of Package riak_ensemble

diff -Ndurp riak_ensemble-2.1.8/src/riak_ensemble_backend.erl riak_ensemble-2.1.8-catch/src/riak_ensemble_backend.erl
--- riak_ensemble-2.1.8/src/riak_ensemble_backend.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/src/riak_ensemble_backend.erl	2025-03-14 17:44:43.113888652 +0200
@@ -144,8 +144,11 @@ latest_obj(Mod, ObjA, ObjB) ->
 
 -spec reply(from(), any()) -> ok.
 reply({{To, Tag}, _Id}, Reply) ->
-    catch To ! {Tag, Reply},
-    ok;
+    try To ! {Tag, Reply} of
+        _ -> ok
+    catch
+        _:_ -> ok
+    end;
 reply({From, Id}, Reply) ->
     riak_ensemble_msg:reply(From, Id, Reply),
     ok.
diff -Ndurp riak_ensemble-2.1.8/src/riak_ensemble_peer.erl riak_ensemble-2.1.8-catch/src/riak_ensemble_peer.erl
--- riak_ensemble-2.1.8/src/riak_ensemble_peer.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/src/riak_ensemble_peer.erl	2025-03-14 17:45:10.593323525 +0200
@@ -863,7 +863,11 @@ following(Msg, From, State) ->
 
 -spec forward(_, fsm_from(), state()) -> {next_state, following, state()}.
 forward(Msg, From, State) ->
-    catch gen_fsm:send_event(peer(leader(State), State), {forward, From, Msg}),
+    try
+        gen_fsm:send_event(peer(leader(State), State), {forward, From, Msg})
+    catch
+        _:_ -> ok
+    end,
     {next_state, following, State}.
 
 -spec valid_request(_,_,state()) -> boolean().
@@ -2238,5 +2242,9 @@ cancel_timer(State=#state{timer=undefine
     State;
 cancel_timer(State=#state{timer=Timer}) ->
     %% Note: gen_fsm cancel_timer discards timer message if already sent
-    catch gen_fsm:cancel_timer(Timer),
+    try
+        gen_fsm:cancel_timer(Timer)
+    catch
+        _:_ -> ok
+    end,
     State#state{timer=undefined}.
diff -Ndurp riak_ensemble-2.1.8/src/riak_ensemble_router.erl riak_ensemble-2.1.8-catch/src/riak_ensemble_router.erl
--- riak_ensemble-2.1.8/src/riak_ensemble_router.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/src/riak_ensemble_router.erl	2025-03-14 18:08:17.760725214 +0200
@@ -142,7 +142,7 @@ cast(Node, Ensemble, Msg) ->
     end.
 
 noconnect_cast(Dest, Msg) ->
-    case catch erlang:send(Dest, {'$gen_cast', Msg}, [noconnect]) of
+    try erlang:send(Dest, {'$gen_cast', Msg}, [noconnect]) of
 	noconnect ->
             spawn(fun() ->
                           case Dest of
@@ -155,8 +155,9 @@ noconnect_cast(Dest, Msg) ->
                           end
                   end),
             nodedown;
-        _ ->
-            ok
+        _ -> ok
+    catch
+        _:_ -> ok
     end.
 
 %% TODO: Switch to using sidejob_config or copy thereof
diff -Ndurp riak_ensemble-2.1.8/src/riak_ensemble_test.erl riak_ensemble-2.1.8-catch/src/riak_ensemble_test.erl
--- riak_ensemble-2.1.8/src/riak_ensemble_test.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/src/riak_ensemble_test.erl	2025-03-14 17:47:01.435044014 +0200
@@ -30,10 +30,10 @@ setup() ->
     ok.
 
 maybe_drop(Id, PeerId) ->
-    case catch ets:member(?ETS_TEST, {drop, {Id, PeerId}}) of
-        true ->
-            true;
-        _ ->
+    try
+        ets:member(?ETS_TEST, {drop, {Id, PeerId}})
+    catch
+        _:_ ->
             false
     end.
 
diff -Ndurp riak_ensemble-2.1.8/src/riak_ensemble_util.erl riak_ensemble-2.1.8-catch/src/riak_ensemble_util.erl
--- riak_ensemble-2.1.8/src/riak_ensemble_util.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/src/riak_ensemble_util.erl	2025-03-14 17:44:52.433696986 +0200
@@ -156,5 +156,9 @@ cast_unreliable(Dest, Request) ->
     bang_unreliable(Dest, {'$gen_cast', Request}).
 
 bang_unreliable(Dest, Msg) ->
-    catch erlang:send(Dest, Msg, [noconnect, nosuspend]),
+    try
+        erlang:send(Dest, Msg, [noconnect, nosuspend])
+    catch
+        _:_ -> ok
+    end,
     Msg.
diff -Ndurp riak_ensemble-2.1.8/test/sc.erl riak_ensemble-2.1.8-catch/test/sc.erl
--- riak_ensemble-2.1.8/test/sc.erl	2017-03-04 00:39:54.000000000 +0200
+++ riak_ensemble-2.1.8-catch/test/sc.erl	2025-03-14 17:48:03.401769650 +0200
@@ -349,6 +349,7 @@ partition(As, Bs) ->
 -endif.
 
 -ifndef(SINGLE_NODE).
+-compile(nowarn_deprecated_catch).
 heal_args(#state{partitioned=Partitioned}) ->
     [Partitioned].
 heal_pre(#state{init=Initialized, partitioned=Partitioned}) ->