Image Load Cancelation - Downgrade error log to warning and note the cause of it

[problem] A rare event that will probably continue to happen until we do
some rewrites is firing as an error.
[solution] Turn error into a warning and document why it currently

Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index 780d096..1ba892d 100644 (file)
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -298,7 +298,7 @@ public:
 
   /**
    * Queue an event with Core.
-   * Pre-processing of events may be benificial e.g. a series of motion events could be throttled, so that only the last event is queued.
+   * Pre-processing of events may be beneficial e.g. a series of motion events could be throttled, so that only the last event is queued.
    * Multi-threading note: this method should be called from the main thread.
    * @param[in] event The new event.
    */

diff --git a/dali/internal/update/resources/resource-manager.cpp b/dali/internal/update/resources/resource-manager.cpp
index 53f3e63..8e62e65 100644 (file)
--- a/dali/internal/update/resources/resource-manager.cpp
+++ b/dali/internal/update/resources/resource-manager.cpp
@@ -857,7 +857,8 @@ void ResourceManager::LoadResponse( ResourceId id, ResourceTypeId type, Resource
   }
   else
   {
-    DALI_LOG_ERROR("ResourceManager::LoadResponse() received a stray load notification for a resource whose loading is not being tracked: (id:%u, status=%s)\n", id, loadStatus==RESOURCE_LOADING?"LOADING":loadStatus==RESOURCE_PARTIALLY_LOADED?"PARTIAL":"COMPLETE");
+    // This warning can fire if a cancelled load is forgotten here while already complete on a resource thread:
+    DALI_LOG_WARNING( "Received a notification for an untracked resource: (id:%u, status=%s)\n", id, loadStatus==RESOURCE_LOADING?"LOADING":loadStatus==RESOURCE_PARTIALLY_LOADED?"PARTIAL":"COMPLETE");
   }
 }