Commit 4c439783 authored by Tim Peters's avatar Tim Peters

Merge rev 37781 from 2.8 branch.

Collector 1860:  use an optimistic savepoint in CopySupport._getCopy
(there's no possiblity of rollback here, so no need to insist that the
data manager support rollbacks).

The other part of this change is in ZODB 3.4.1b4, also stitched in
by this checkin.
parent de3dbdbb
...@@ -466,7 +466,7 @@ class CopySource(ExtensionClass.Base): ...@@ -466,7 +466,7 @@ class CopySource(ExtensionClass.Base):
# 1) Make sure the data about to be exported is current # 1) Make sure the data about to be exported is current
# 2) Ensure self._p_jar and container._p_jar are set even if # 2) Ensure self._p_jar and container._p_jar are set even if
# either one is a new object # either one is a new object
transaction.commit(1) transaction.savepoint(optimistic=True)
if self._p_jar is None: if self._p_jar is None:
raise CopyError, ( raise CopyError, (
......
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