From bce225a20094284670caa231e66d3a55ebc0ccb8 Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Mon, 31 Aug 2015 17:03:12 +0900 Subject: [PATCH] Bugfix: a30_make_inner_projection() ignore newprop down list if none proj --- src/machi_chain_manager1.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/machi_chain_manager1.erl b/src/machi_chain_manager1.erl index 59a7ba0..3efddef 100644 --- a/src/machi_chain_manager1.erl +++ b/src/machi_chain_manager1.erl @@ -1376,7 +1376,12 @@ react_to_env_A30(Retries, P_latest, LatestUnanimousP, _ReadExtra, a30_make_inner_projection(P_current, P_newprop3, P_latest, Up, #ch_mgr{name=MyName, consistency_mode=CMode} = S) -> AllHosed = get_all_hosed(P_newprop3), - NewPropDown = P_newprop3#projection_v1.down, + NewPropDown = if P_newprop3#projection_v1.upi == [] -> + %% This is a none proj, don't believe down list + []; + true -> + P_newprop3#projection_v1.down + end, P_current_has_inner_p = inner_projection_exists(P_current), P_current_ios = inner_projection_or_self(P_current), AllHosed_and_Down = lists:usort(AllHosed ++ NewPropDown),