Commit e1929d2a authored by Jeremy Hylton's avatar Jeremy Hylton

tpc_begin(): Assign the ext arg to the right attribute on the

             Transaction instance.

tpc_finish(): Ignore the arguments other than id.  They were handled
              in the tpc_begin().
parent 377fc848
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
# #
############################################################################## ##############################################################################
__version__ = "$Revision: 1.23 $"[11:-2] __version__ = "$Revision: 1.24 $"[11:-2]
import asyncore, socket, string, sys, os import asyncore, socket, string, sys, os
from smac import SizedMessageAsyncConnection from smac import SizedMessageAsyncConnection
...@@ -441,7 +441,7 @@ class ZEOConnection(SizedMessageAsyncConnection): ...@@ -441,7 +441,7 @@ class ZEOConnection(SizedMessageAsyncConnection):
r=StorageServerError("Couldn't pickle exception %s" % `newserial`) r=StorageServerError("Couldn't pickle exception %s" % `newserial`)
dump('',1) # clear pickler dump('',1) # clear pickler
r=dump((oid, r),1) r=dump((oid, r),1)
self.message_output('s'+r) self.message_output('s'+r)
return _noreturn return _noreturn
...@@ -499,6 +499,7 @@ class ZEOConnection(SizedMessageAsyncConnection): ...@@ -499,6 +499,7 @@ class ZEOConnection(SizedMessageAsyncConnection):
t.id=id t.id=id
t.user=user t.user=user
t.description=description t.description=description
t._extension=ext
storage.tpc_begin(t) storage.tpc_begin(t)
self.__invalidated=[] self.__invalidated=[]
...@@ -532,9 +533,6 @@ class ZEOConnection(SizedMessageAsyncConnection): ...@@ -532,9 +533,6 @@ class ZEOConnection(SizedMessageAsyncConnection):
def tpc_finish(self, id, user, description, ext): def tpc_finish(self, id, user, description, ext):
t=self._transaction t=self._transaction
if id != t.id: return if id != t.id: return
t.user=user
t.description=description
t.ext=ext
storage=self.__storage storage=self.__storage
r=storage.tpc_finish(t) r=storage.tpc_finish(t)
......
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