corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1371550 - create worker thread before it is required; r=bagder

Browse Source 
MozReview-Commit-ID: 9DydRQwOHyT
This commit is contained in:
Liang-Heng Chen
2017-06-09 15:11:24 +08:00
parent 598ad25de1
commit 3acf537675
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netwerk/base/nsProtocolProxyService.cpp
View File

@@ -513,6 +513,8 @@ nsProtocolProxyService::~nsProtocolProxyService()
nsresult
nsProtocolProxyService::Init()
{
NS_NewNamedThread("SysProxySetting", getter_AddRefs(mProxySettingThread));
// failure to access prefs is non-fatal
nsCOMPtr<nsIPrefBranch> prefBranch =
do_GetService(NS_PREFSERVICE_CONTRACTID);
@@ -532,8 +534,6 @@ nsProtocolProxyService::Init()
obs->AddObserver(this, NS_NETWORK_LINK_TOPIC, false);
}
NS_NewNamedThread("SysProxySetting", getter_AddRefs(mProxySettingThread));
return NS_OK;
}
@@ -590,10 +590,6 @@ nsProtocolProxyService::AsyncConfigureFromPAC(bool aForceReload,
{
MOZ_ASSERT(NS_IsMainThread());
if (NS_WARN_IF(!mProxySettingThread)) {
return NS_ERROR_NOT_INITIALIZED;
}
bool mainThreadOnly;
nsresult rv = mSystemProxySettings->GetMainThreadOnly(&mainThreadOnly);
if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -611,6 +607,10 @@ nsProtocolProxyService::AsyncConfigureFromPAC(bool aForceReload,
if (mainThreadOnly) {
return req->Run();
}
if (NS_WARN_IF(!mProxySettingThread)) {
return NS_ERROR_NOT_INITIALIZED;
}
return mProxySettingThread->Dispatch(req, nsIEventTarget::DISPATCH_NORMAL);
}