[tracker] tracker-store: Create our own error if cancelled



commit 501862474329b688ea0cbd2111a43ac8deec901c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Feb 23 11:11:42 2017 +0100

    tracker-store: Create our own error if cancelled
    
    No functional change, but fixes coverity warning about
    g_cancellable_set_error_if_cancelled() return value being unchecked,
    as vala would just check the returned error pointer.
    
    Coverity ID: 1298211

 src/tracker-store/tracker-store.vala |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/tracker-store/tracker-store.vala b/src/tracker-store/tracker-store.vala
index 00a40bb..ef0598c 100644
--- a/src/tracker-store/tracker-store.vala
+++ b/src/tracker-store/tracker-store.vala
@@ -164,12 +164,10 @@ public class Tracker.Store {
                if (task.type == TaskType.QUERY) {
                        var query_task = (QueryTask) task;
 
-                       if (task.error == null) {
-                               try {
-                                       query_task.cancellable.set_error_if_cancelled ();
-                               } catch (Error e) {
-                                       task.error = e;
-                               }
+                       if (task.error == null &&
+                           query_task.cancellable != null &&
+                           query_task.cancellable.is_cancelled ()) {
+                               task.error = new IOError.CANCELLED ("Operation was cancelled");
                        }
 
                        task.callback ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]