Commit 4654bb13 authored by Jim Fulton's avatar Jim Fulton

Fixed a bug that messed up ZClass persistence.

parent a9db74f4
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.14 1999/07/07 10:58:47 jim Exp $""" $Id: Connection.py,v 1.15 1999/07/07 19:52:28 jim Exp $"""
__version__='$Revision: 1.14 $'[11:-2] __version__='$Revision: 1.15 $'[11:-2]
from cPickleCache import PickleCache from cPickleCache import PickleCache
from POSException import ConflictError, ExportError from POSException import ConflictError, ExportError
...@@ -402,6 +402,7 @@ class Connection(ExportImport.ExportImport): ...@@ -402,6 +402,7 @@ class Connection(ExportImport.ExportImport):
def setklassstate(self, object, def setklassstate(self, object,
tt=type(()), ct=type(HelperClass)): tt=type(()), ct=type(HelperClass)):
try:
oid=object._p_oid oid=object._p_oid
__traceback_info__=oid __traceback_info__=oid
p, serial = self._storage.load(oid, self._version) p, serial = self._storage.load(oid, self._version)
...@@ -425,8 +426,11 @@ class Connection(ExportImport.ExportImport): ...@@ -425,8 +426,11 @@ class Connection(ExportImport.ExportImport):
object._p_oid=oid object._p_oid=oid
object._p_jar=self object._p_jar=self
object._p_changed=None object._p_changed=0
object._p_serial=serial object._p_serial=serial
except:
LOG('ZODB',ERROR, 'setklassstate failed', error=sys.exc_info)
raise
def tpc_abort(self, transaction): def tpc_abort(self, transaction):
self._storage.tpc_abort(transaction) self._storage.tpc_abort(transaction)
......
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