Commit 936ee9ba authored by Aurel's avatar Aurel

loadSerial only return data, this should fixed error in tryToResolveConflict


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@174 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent f7ec287f
......@@ -366,7 +366,7 @@ class Application(object):
"""Load an object for a given oid and serial."""
# Do not try in cache as it manages only up-to-date object
logging.debug('loading %s at %s', dump(oid), dump(serial))
return self._load(oid, serial)[:2], None
return self._load(oid, serial)[0]
def loadBefore(self, oid, tid):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment