diff --git a/src/coreclr/binder/applicationcontext.cpp b/src/coreclr/binder/applicationcontext.cpp index bb399c5ffb01c0..280ecef7873243 100644 --- a/src/coreclr/binder/applicationcontext.cpp +++ b/src/coreclr/binder/applicationcontext.cpp @@ -80,16 +80,11 @@ namespace BINDER_SPACE HRESULT ApplicationContext::SetupBindingPaths(SString &sTrustedPlatformAssemblies, SString &sPlatformResourceRoots, - SString &sAppPaths, - BOOL fAcquireLock) + SString &sAppPaths) { HRESULT hr = S_OK; - CRITSEC_Holder contextLock(fAcquireLock ? GetCriticalSectionCookie() : NULL); - if (m_pTrustedPlatformAssemblyMap != nullptr) - { - GO_WITH_HRESULT(S_OK); - } + _ASSERTE(m_pTrustedPlatformAssemblyMap == nullptr); // // Parse TrustedPlatformAssemblies diff --git a/src/coreclr/binder/defaultassemblybinder.cpp b/src/coreclr/binder/defaultassemblybinder.cpp index cf986dc9b6ab3a..ae9833f9de0d25 100644 --- a/src/coreclr/binder/defaultassemblybinder.cpp +++ b/src/coreclr/binder/defaultassemblybinder.cpp @@ -203,7 +203,7 @@ HRESULT DefaultAssemblyBinder::SetupBindingPaths(SString &sTrustedPlatformAssem EX_TRY { - hr = GetAppContext()->SetupBindingPaths(sTrustedPlatformAssemblies, sPlatformResourceRoots, sAppPaths, TRUE /* fAcquireLock */); + hr = GetAppContext()->SetupBindingPaths(sTrustedPlatformAssemblies, sPlatformResourceRoots, sAppPaths); } EX_CATCH_HRESULT(hr); return hr; @@ -231,4 +231,3 @@ HRESULT DefaultAssemblyBinder::BindToSystem(BINDER_SPACE::Assembly** ppSystemAss return hr; } - diff --git a/src/coreclr/binder/inc/applicationcontext.hpp b/src/coreclr/binder/inc/applicationcontext.hpp index 8aad61e49f4b49..6642e68fd5f047 100644 --- a/src/coreclr/binder/inc/applicationcontext.hpp +++ b/src/coreclr/binder/inc/applicationcontext.hpp @@ -86,8 +86,7 @@ namespace BINDER_SPACE HRESULT SetupBindingPaths(/* in */ SString &sTrustedPlatformAssemblies, /* in */ SString &sPlatformResourceRoots, - /* in */ SString &sAppPaths, - /* in */ BOOL fAcquireLock); + /* in */ SString &sAppPaths); // Getters/Setter inline ExecutionContext *GetExecutionContext();