Commit 40f502f1 authored by Jeremy Hylton's avatar Jeremy Hylton

Treat tpc_vote() as a noop if the transaction arg isn't the current

transaction.
parent 97bb38ce
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Network ZODB storage client """Network ZODB storage client
""" """
__version__='$Revision: 1.28 $'[11:-2] __version__='$Revision: 1.29 $'[11:-2]
import struct, time, os, socket, string, Sync, zrpc, ClientCache import struct, time, os, socket, string, Sync, zrpc, ClientCache
import tempfile, Invalidator, ExtensionClass, thread import tempfile, Invalidator, ExtensionClass, thread
...@@ -402,10 +402,10 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage): ...@@ -402,10 +402,10 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage):
finally: self._lock_release() finally: self._lock_release()
def tpc_vote(self, transaction): def tpc_vote(self, transaction):
if transaction is not self._transaction:
raise POSException.StorageTransactionError(self, transaction)
self._lock_acquire() self._lock_acquire()
try: try:
if transaction is not self._transaction:
return
self._call('vote', self._serial) self._call('vote', self._serial)
if self._serials: if self._serials:
......
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