Commit 0b57a7ab authored by Jim Fulton's avatar Jim Fulton

Change to automagically add stub tpc_vote to storage if it's

missing so that other code doesn't have to check that it's there.
Removed one check and added assignment of storage tpc_vote method
in version support code.
parent 6a5da780
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Database objects """Database objects
$Id: DB.py,v 1.21 2000/08/07 19:03:55 jim Exp $""" $Id: DB.py,v 1.22 2000/08/08 17:47:29 jim Exp $"""
__version__='$Revision: 1.21 $'[11:-2] __version__='$Revision: 1.22 $'[11:-2]
import cPickle, cStringIO, sys, POSException, UndoLogCompatible import cPickle, cStringIO, sys, POSException, UndoLogCompatible
from Connection import Connection from Connection import Connection
...@@ -123,6 +123,7 @@ class DB(UndoLogCompatible.UndoLogCompatible): ...@@ -123,6 +123,7 @@ class DB(UndoLogCompatible.UndoLogCompatible):
""" """
self._storage=storage self._storage=storage
storage.registerDB(self, None) storage.registerDB(self, None)
if not hasattr(storage,'tpc_vote'): storage.tpc_vote=lambda *args: None
try: storage.load('\0\0\0\0\0\0\0\0','') try: storage.load('\0\0\0\0\0\0\0\0','')
except: except:
import PersistentMapping import PersistentMapping
...@@ -134,7 +135,6 @@ class DB(UndoLogCompatible.UndoLogCompatible): ...@@ -134,7 +135,6 @@ class DB(UndoLogCompatible.UndoLogCompatible):
t.description='initial database creation' t.description='initial database creation'
storage.tpc_begin(t) storage.tpc_begin(t)
storage.store('\0\0\0\0\0\0\0\0', None, file.getvalue(), '', t) storage.store('\0\0\0\0\0\0\0\0', None, file.getvalue(), '', t)
if hasattr(storage, 'tpc_vote'): # whimper
storage.tpc_vote(t) storage.tpc_vote(t)
storage.tpc_finish(t) storage.tpc_finish(t)
...@@ -578,6 +578,7 @@ class CommitVersion: ...@@ -578,6 +578,7 @@ class CommitVersion:
self._dest=dest self._dest=dest
self.tpc_abort=s.tpc_abort self.tpc_abort=s.tpc_abort
self.tpc_begin=s.tpc_begin self.tpc_begin=s.tpc_begin
self.tpc_vote=s.tpc_vote
self.tpc_finish=s.tpc_finish self.tpc_finish=s.tpc_finish
get_transaction().register(self) get_transaction().register(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