[commits] (vajda) [11246] - fixed bug 6383

[commits]

Title: [commits] (vajda) [11246] - fixed bug 6383

Revision

11246

Author

vajda

Date

2006-07-24 13:15:16 -0700 (Mon, 24 Jul 2006)

Log Message

- fixed bug 6383
(http://bugzilla.osafoundation.org/show_bug.cgi?id=6383)
(Can't exit Chandler: repository error)

Modified Paths

• trunk/chandler/repository/item/Values.py

Diff

Modified: trunk/chandler/repository/item/Values.py (11245 => 11246)

--- trunk/chandler/repository/item/Values.py	2006-07-23 15:51:18 UTC (rev 11245)
+++ trunk/chandler/repository/item/Values.py	2006-07-24 20:15:16 UTC (rev 11246)
@@ -1032,7 +1032,7 @@
                 if name in dirties:
                     if value is Nil:
                         view._e_3_overlap(MergeError.REF, self._item, name)
-                    elif value._isRefs():
+                    elif value is not None and value._isRefs():
                         if value._isSet():
                             newChanges[name] = ('set', value)
                             changes[name] = {}
@@ -1053,7 +1053,7 @@
                 else:
                     if value is Nil:
                         newChanges[name] = ('nil', Nil)
-                    elif value._isRefs():
+                    elif value is not None and value._isRefs():
                         if value._isSet():
                             newChanges[name] = ('set', value)
                             value._collectIndexChanges(name, indexChanges)

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits