Title: [commits] (vajda) [11257] fixed bug 6383 on a3
Revision
11257
Author
vajda
Date
2006-07-25 13:32:12 -0700 (Tue, 25 Jul 2006)

Log Message

fixed bug 6383 on a3

Modified Paths

Diff

Modified: branches/0.7alpha3/chandler/repository/item/Values.py (11256 => 11257)

--- branches/0.7alpha3/chandler/repository/item/Values.py	2006-07-25 20:08:31 UTC (rev 11256)
+++ branches/0.7alpha3/chandler/repository/item/Values.py	2006-07-25 20:32:12 UTC (rev 11257)
@@ -1036,7 +1036,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] = (True, value)
                             changes[name] = {}
@@ -1049,7 +1049,7 @@
                 else:
                     if value is Nil:
                         newChanges[name] = (False, Nil)
-                    elif value._isRefs():
+                    elif value is not None and value._isRefs():
                         if value._isSet():
                             newChanges[name] = (True, value)
                         else:




_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to