Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prevent yielding from catch block

Browse source
This commit is contained in:
Daniel Larimer 2015-09-14 11:14:52 -04:00
parent 483b348878
commit d19f67d94f
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/rpc/websocket_api.cpp
View file

@ -81,6 +81,7 @@ std::string websocket_api_connection::on_message(
if( var_obj.contains( "method" ) ) if( var_obj.contains( "method" ) )
{ {
auto call = var.as<fc::rpc::request>(); auto call = var.as<fc::rpc::request>();
exception_ptr optexcept;
try try
{ {
auto result = _rpc_state.local_call( call.method, call.params ); auto result = _rpc_state.local_call( call.method, call.params );
@ -96,12 +97,16 @@ std::string websocket_api_connection::on_message(
{ {
if( call.id ) if( call.id )
{ {
auto reply = fc::json::to_string( response( *call.id, error_object{ 1, e.to_detail_string(), fc::variant(e)} ) ); optexcept = e.dynamic_copy_exception();
}
}
if( optexcept ) {
auto reply = fc::json::to_string( response( *call.id, error_object{ 1, optexcept->to_detail_string(), fc::variant(*optexcept)} ) );
if( send_message ) if( send_message )
_connection.send_message( reply ); _connection.send_message( reply );
return reply; return reply;
}
} }
} }
else else