From 371bf907fe24c01a03f526b15ead08f7261350ce Mon Sep 17 00:00:00 2001 From: John Bates Date: Thu, 11 Jan 2018 11:42:55 -0800 Subject: Rearm pdx fd on errors This is not necessarily fixing anything, because we haven't seen these errors in logs to confirm that they are problems. However, we should always rearm on non-fatal errors. Bug: 71759645 Test: Manually built and ran, but unclear how to trigger those errors. Change-Id: Ia2bf3e6affaf8905d56fd82e0bbd0fbc9bf4f304 --- libs/vr/libpdx_uds/service_endpoint.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vr/libpdx_uds/service_endpoint.cpp b/libs/vr/libpdx_uds/service_endpoint.cpp index 0ee77f43a6..32d40e8371 100644 --- a/libs/vr/libpdx_uds/service_endpoint.cpp +++ b/libs/vr/libpdx_uds/service_endpoint.cpp @@ -594,9 +594,10 @@ Status Endpoint::MessageReceive(Message* message) { if (socket_fd_ && event.data.fd == socket_fd_.Get()) { auto status = AcceptConnection(message); - if (!status) - return status; - return ReenableEpollEvent(socket_fd_.Borrow()); + auto reenable_status = ReenableEpollEvent(socket_fd_.Borrow()); + if (!reenable_status) + return reenable_status; + return status; } BorrowedHandle channel_fd{event.data.fd}; -- cgit v1.2.3-59-g8ed1b