[rygel] core: Add check if no parent exists



commit 105fa840f95e37a28b7da5fa23f850533ea3ec95
Author: Jens Georg <mail jensge org>
Date:   Sun Jul 5 13:13:26 2009 +0200

    core: Add check if no parent exists

 src/rygel/rygel-media-db.vala |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/src/rygel/rygel-media-db.vala b/src/rygel/rygel-media-db.vala
index 595e759..dcef75c 100644
--- a/src/rygel/rygel-media-db.vala
+++ b/src/rygel/rygel-media-db.vala
@@ -610,9 +610,22 @@ public class Rygel.MediaDB : Object {
         if (rc == Sqlite.OK) {
             statement.bind_text (1, object_id);
             while ((rc = statement.step ()) == Sqlite.ROW) {
-                var parent = get_object (statement.column_text (17));
-                obj = get_object_from_statement ((MediaContainer)parent, object_id, statement);
-                obj.parent_ref = (MediaContainer)parent;
+                MediaContainer parent = null;
+                var parent_id = statement.column_text (17);
+                if (parent_id != null) {
+                    parent = (MediaContainer) get_object (
+                                    statement.column_text (17));
+                } else {
+                    if (statement.column_text (0) != "0") {
+                        warning ("Inconsitent database; non-root element " +
+                                 "without parent found. Id is %s",
+                                 statement.column_text (0));
+                    }
+                }
+                obj = get_object_from_statement ((MediaContainer) parent,
+                                                 object_id,
+                                                 statement);
+                obj.parent_ref = (MediaContainer) parent;
                 obj.parent = obj.parent_ref;
                 break;
             }



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