summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Bates <jbates@google.com> 2018-01-11 11:42:55 -0800
committer John Bates <jbates@google.com> 2018-03-13 15:42:28 +0000
commit371bf907fe24c01a03f526b15ead08f7261350ce (patch)
treef9af7254b1d26e009971530132daf2dc8e5fd544
parent93ec3a87ce489e6132829b73e7964efb5d5479d1 (diff)
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
-rw-r--r--libs/vr/libpdx_uds/service_endpoint.cpp7
1 files 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<void> 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};