commit a66fee163166472d577750f9f2f66343340df251
author Xusong Wang <xusongw@google.com> Fri Jan 17 10:36:52 2020 -0800
committer Xusong Wang <xusongw@google.com> Fri Jan 17 10:36:52 2020 -0800
tree 9e68cab22cc7db08286fba1712c414f9f6c898d9
parent 9c36a02af2d4fd22448af655e60f29d994d40800

Preserve output shapes in case of error in DefaultBurstExecutorWithCache

Bug: 147891695
Test: presubmit
Change-Id: Ie1972abce6046bcc892462a94bd8d19dc0b87e04

nn/common/ExecutionBurstServer.cpp

diff --git a/nn/common/ExecutionBurstServer.cpp b/nn/common/ExecutionBurstServer.cpp
index 0bcb57d..f0c0f51 100644
--- a/nn/common/ExecutionBurstServer.cpp
+++ b/nn/common/ExecutionBurstServer.cpp
@@ -90,7 +90,7 @@
         const Return<void> ret = mpPreparedModel->executeSynchronously(fullRequest, measure, cb);
         if (!ret.isOk() || returnedStatus != ErrorStatus::NONE) {
             LOG(ERROR) << "IPreparedModelAdapter::execute -- Error executing";
-            return {returnedStatus, {}, kNoTiming};
+            return {returnedStatus, std::move(returnedOutputShapes), kNoTiming};
         }
 
         return std::make_tuple(returnedStatus, std::move(returnedOutputShapes), returnedTiming);