Apply suggestions from code review

AaronRobinsonMSFT · Oct 8, 2023 · 4d121f7 · 4d121f7
1 parent de5beac
commit 4d121f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/src/platform/dnne.h b/src/platform/dnne.h
@@ -75,8 +75,6 @@ enum failure_type
 {
     failure_load_runtime = 1,
     failure_load_export,
-    failure_get_current_app_domain_id,
-	failure_get_current_app_domain_id_backup_try
 };
 typedef void (DNNE_CALLTYPE* failure_fn)(enum failure_type type, int error_code);
 

diff --git a/src/platform/platform_v4.cpp b/src/platform/platform_v4.cpp
@@ -156,25 +156,24 @@ namespace
             // Release all other CLR resources
             (void)metahost->Release();
 
-
             // Start the runtime
             hr = runtimeHost->Start();
             IF_FAILURE_RETURN_OR_ABORT(ret, failure_load_runtime, hr, &_prepare_lock);
 
             hr = runtimeHost->GetCurrentAppDomainId(&_appDomainId);
-			if (hr != S_OK)
-			{
-				ICorRuntimeHost* oldRuntimeHost;
-				hr = runtimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, (void**)&oldRuntimeHost);
-				IF_FAILURE_RETURN_OR_ABORT(ret, failure_get_current_app_domain_id_backup_try, hr, &_prepare_lock);
-				IUnknown* pUnk2;
-				hr = oldRuntimeHost->GetDefaultDomain(&pUnk2);
-				IF_FAILURE_RETURN_OR_ABORT(ret, failure_get_current_app_domain_id_backup_try, hr, &_prepare_lock);
-				hr = runtimeHost->GetCurrentAppDomainId(&_appDomainId);
-			}
-			(void)runtimeInfo->Release();//can't release earlierincase backup failure
-
-			IF_FAILURE_RETURN_OR_ABORT(ret, failure_get_current_app_domain_id, hr, &_prepare_lock);
+	    if (hr != S_OK)
+            {
+                ICorRuntimeHost* oldRuntimeHost;
+                hr = runtimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, (void**)&oldRuntimeHost);
+                IF_FAILURE_RETURN_OR_ABORT(ret, failure_load_runtime, hr, &_prepare_lock);
+                IUnknown* pUnk2;
+                hr = oldRuntimeHost->GetDefaultDomain(&pUnk2);
+                IF_FAILURE_RETURN_OR_ABORT(ret, failure_load_runtime, hr, &_prepare_lock);
+                hr = runtimeHost->GetCurrentAppDomainId(&_appDomainId);
+            }
+            (void)runtimeInfo->Release(); //can't release earlier incase backup failure
+
+            IF_FAILURE_RETURN_OR_ABORT(ret, failure_load_runtime, hr, &_prepare_lock);
             (void)runtimeHost->QueryInterface(__uuidof(ICLRPrivRuntime), (void**)&_host);
             (void)runtimeHost->Release();
             assert(_host != nullptr);