fixed merge problem
This commit is contained in:
parent
717c43a69f
commit
a9987202d6
|
@ -1818,7 +1818,7 @@ ACTOR Future<Void> statusServer(FutureStream< StatusRequest> requests,
|
||||||
else
|
else
|
||||||
requests_batch.back().reply.send(result.get());
|
requests_batch.back().reply.send(result.get());
|
||||||
requests_batch.pop_back();
|
requests_batch.pop_back();
|
||||||
Void _ = wait( yield() );
|
wait( yield() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Error &e) {
|
catch (Error &e) {
|
||||||
|
|
Loading…
Reference in New Issue