From af94d1c1c31b073dd1fb81a622bf5164dc3671cd Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Thu, 10 Sep 2015 02:15:49 +0900 Subject: [PATCH] Bugfix: ExpectedUPI error in A40 --- src/machi_chain_manager1.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/machi_chain_manager1.erl b/src/machi_chain_manager1.erl index fe52320..8dd6b0a 100644 --- a/src/machi_chain_manager1.erl +++ b/src/machi_chain_manager1.erl @@ -1310,9 +1310,11 @@ react_to_env_A40(Retries, P_newprop, P_latest, LatestUnanimousP, AmHosedP, ExpectedUPI = if CMode == cp_mode -> []; CMode == ap_mode -> [MyName] end, - if P_current#projection_v1.upi /= ExpectedUPI + if (P_current#projection_v1.upi /= ExpectedUPI orelse + P_current#projection_v1.repairing /= []) andalso - P_newprop#projection_v1.upi == ExpectedUPI -> + (P_newprop#projection_v1.upi == ExpectedUPI andalso + P_newprop#projection_v1.repairing == []) -> %% I am hosed. I need to shut up and quit disturbing my %% peers. If P_latest is the none projection that I wrote %% on a previous iteration and it's also unanimous, then