openstack/deb-cinder
Code Issues Proposed changes

Merge "Stop assuming persistent OVOs are also DictCompat"

Browse Source
This commit is contained in:
Jenkins 2016-06-16 04:57:28 +00:00 committed by Gerrit Code Review
commit 1bc0da2034
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/objects/base.py
View File

@ -386,8 +386,9 @@ class CinderPersistentObject(object):
# Only update attributes that are already set. We do not want to
# unexpectedly trigger a lazy-load.
if self.obj_attr_is_set(field):
if self[field] != current[field]:
self[field] = current[field]
current_field = getattr(current, field)
if getattr(self, field) != current_field:
setattr(self, field, current_field)
self.obj_reset_changes()