From 736fc41bb9d0107498993879e9d39267b03aae64 Mon Sep 17 00:00:00 2001 From: Cristian Luis Duarte Date: Wed, 4 Jul 2018 19:37:12 -0300 Subject: [PATCH] Android - Remove resume code that tries the next pending download as entering domains asks for resources anyway --- libraries/networking/src/ResourceCache.cpp | 13 ------------- libraries/networking/src/ResourceCache.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 257065e738..f0094289a6 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -101,19 +101,6 @@ void ResourceCacheSharedItems::pausePendingRequests() { void ResourceCacheSharedItems::resumePendingRequests() { _pendingRequestsPaused = false; - auto resource = getHighestPendingRequest(); - qDebug() << "[REQUESTTIMES] ResourceCacheSharedItems::resumePendingRequests resource? " << (resource?"true":"false"); - // ResourceCache::attemptHighestPriorityRequest() code - if (!resource) return; - if (ResourceCache::getRequestsActive() >= ResourceCache::getRequestLimit()) { - // wait until a slot becomes available - appendPendingRequest(resource); - return; - } - // ResourceCache::attemptRequest code - ResourceCache::incRequestsActive(); - appendActiveRequest(resource); - resource->makeRequest(); } QSharedPointer ResourceCacheSharedItems::getHighestPendingRequest() { diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h index 7c3c309293..29ed88991c 100644 --- a/libraries/networking/src/ResourceCache.h +++ b/libraries/networking/src/ResourceCache.h @@ -227,8 +227,6 @@ public: static int getRequestsActive() { return _requestsActive; } - static void incRequestsActive() { _requestsActive++; } - void setUnusedResourceCacheSize(qint64 unusedResourcesMaxSize); qint64 getUnusedResourceCacheSize() const { return _unusedResourcesMaxSize; }