media-export: fix compiler warning
authorThijs Vermeir <thijsvermeir@gmail.com>
Tue, 19 Jul 2011 20:48:01 +0000 (22:48 +0200)
committerJens Georg <mail@jensge.org>
Tue, 19 Jul 2011 20:48:41 +0000 (22:48 +0200)
unreachable catch clause detected

https://bugzilla.gnome.org/show_bug.cgi?id=654833

src/plugins/media-export/rygel-media-export-media-cache.vala

index 1c19560..1d1dea8 100644 (file)
@@ -343,30 +343,24 @@ public class Rygel.MediaExport.MediaCache : Object {
         Database.RowCallback callback = (statement) => {
             var child_id = statement.column_text (DetailColumn.ID);
             var parent_id = statement.column_text (DetailColumn.PARENT);
-            try {
-                if (parent == null || parent_id != parent.id) {
-                    parent = new NullContainer ();
-                    parent.id = parent_id;
-                }
-
-                if (parent != null) {
-                    children.add (get_object_from_statement (parent,
-                                                             child_id,
-                                                             statement));
-                    children.last ().parent_ref = parent;
-                } else {
-                    warning ("Inconsistent database: item %s " +
-                             "has no parent %s",
-                             child_id,
-                             parent_id);
-                }
-
-                return true;
-            } catch (DatabaseError error) {
-                warning ("Failed to get parent item: %s", error.message);
+            if (parent == null || parent_id != parent.id) {
+                parent = new NullContainer ();
+                parent.id = parent_id;
+            }
 
-                return false;
+            if (parent != null) {
+                children.add (get_object_from_statement (parent,
+                                                         child_id,
+                                                         statement));
+                children.last ().parent_ref = parent;
+            } else {
+                warning ("Inconsistent database: item %s " +
+                         "has no parent %s",
+                         child_id,
+                         parent_id);
             }
+
+            return true;
         };
 
         var sql = this.sql.make (SQLString.GET_OBJECTS_BY_FILTER);