From d18f0fc47b29a824de0750dfc132c2ead1bc232f Mon Sep 17 00:00:00 2001
From: Jeff <jeffbloo@outlook.com>
Date: Wed, 15 Apr 2020 15:37:13 -0700
Subject: [PATCH] Fix error handling for OnSessionInitializationEnd

---
 onnxruntime/core/session/inference_session.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/onnxruntime/core/session/inference_session.cc b/onnxruntime/core/session/inference_session.cc
index 7a662117b3..66aad34b5f 100644
--- a/onnxruntime/core/session/inference_session.cc
+++ b/onnxruntime/core/session/inference_session.cc
@@ -931,12 +931,14 @@ common::Status InferenceSession::Initialize() {
   }
 
   if (status.IsOK()) {
-    auto retval = status;
     for (auto& xp : execution_providers_) {
-      auto status = xp->OnSessionInitializationEnd();
-      ORT_CHECK_AND_SET_RETVAL(status);
+      auto endStatus = xp->OnSessionInitializationEnd();
+      if (status.IsOK()) {
+        status = endStatus;
+      }
     }
   }
+
   return status;
 }