Commit f864bdf2 authored by Jim Fulton's avatar Jim Fulton

Made methods more robust to strange errors (arising from the fact that

some of the inquiry calls on DB objects should be available on
Connection objects to take subtransactions into account.)
parent 3486b02e
...@@ -111,7 +111,9 @@ class PersistentUtil: ...@@ -111,7 +111,9 @@ class PersistentUtil:
if jar is None or oid is None: return None if jar is None or oid is None: return None
try: mv=jar.db().modifiedInVersion try: mv=jar.db().modifiedInVersion
except: pass except: pass
else: return mv(oid) else:
try: return mv(oid)
except: return jar.getVersion()
# BoboPOS 2 code: # BoboPOS 2 code:
oid=self._p_oid oid=self._p_oid
...@@ -127,7 +129,9 @@ class PersistentUtil: ...@@ -127,7 +129,9 @@ class PersistentUtil:
if jar is None or oid is None: return None if jar is None or oid is None: return None
try: mv=jar.db().modifiedInVersion try: mv=jar.db().modifiedInVersion
except: pass except: pass
else: return mv(oid)==jar.getVersion() else:
try: return mv(oid)==jar.getVersion()
except: return 1
# BoboPOS 2 code: # BoboPOS 2 code:
jar=self._p_jar jar=self._p_jar
......
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