未验证 提交 57ca7304 编写于 作者: K Kevin Heifner 提交者: GitHub

Merge pull request #2684 from brianjohnson5972/deferred_soft_fail_error

Fixed deferred transaction soft fail crash
...@@ -427,11 +427,6 @@ struct controller_impl { ...@@ -427,11 +427,6 @@ struct controller_impl {
return; return;
} }
optional<fc::exception> soft_except;
optional<fc::exception> hard_except;
std::exception_ptr except_ptr;
std::exception_ptr hard_except_ptr;
auto start = fc::time_point::now(); auto start = fc::time_point::now();
transaction_trace_ptr trace; transaction_trace_ptr trace;
flat_set<account_name> bill_to_accounts; flat_set<account_name> bill_to_accounts;
...@@ -479,7 +474,7 @@ struct controller_impl { ...@@ -479,7 +474,7 @@ struct controller_impl {
if( gto.sender != account_name() ) { if( gto.sender != account_name() ) {
// Attempt error handling for the generated transaction. // Attempt error handling for the generated transaction.
edump((soft_except->to_detail_string())); edump((trace->soft_except->to_detail_string()));
auto error_trace = apply_onerror( gto, deadline, trace->cpu_usage, start ); auto error_trace = apply_onerror( gto, deadline, trace->cpu_usage, start );
error_trace->failed_dtrx_trace = trace; error_trace->failed_dtrx_trace = trace;
trace = error_trace; trace = error_trace;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册