Commit e2f4249c authored by Jim Fulton's avatar Jim Fulton

modifiedInVersion failed to return the result in some (normal) cases.

parent aa7bd65b
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.15 1999/07/07 19:52:28 jim Exp $""" $Id: Connection.py,v 1.16 1999/07/08 16:33:52 jim Exp $"""
__version__='$Revision: 1.15 $'[11:-2] __version__='$Revision: 1.16 $'[11:-2]
from cPickleCache import PickleCache from cPickleCache import PickleCache
from POSException import ConflictError, ExportError from POSException import ConflictError, ExportError
...@@ -367,8 +367,10 @@ class Connection(ExportImport.ExportImport): ...@@ -367,8 +367,10 @@ class Connection(ExportImport.ExportImport):
""" """
self._invalidated[oid]=1 self._invalidated[oid]=1
def modifiedInVersion(self, o): def modifiedInVersion(self, oid):
return self._db.modifiedInVersion(o._p_oid) try: return self._db.modifiedInVersion(oid)
except KeyError:
return self._version
def root(self): return self['\0\0\0\0\0\0\0\0'] def root(self): return self['\0\0\0\0\0\0\0\0']
...@@ -466,11 +468,6 @@ class Connection(ExportImport.ExportImport): ...@@ -466,11 +468,6 @@ class Connection(ExportImport.ExportImport):
get_transaction().abort() get_transaction().abort()
self._cache.invalidate(self._invalidated) self._cache.invalidate(self._invalidated)
def modifiedInVersion(self, oid):
try: self._db.modifiedInVersion(oid)
except KeyError:
return self._version
class tConnection(Connection): class tConnection(Connection):
def close(self): def close(self):
......
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