Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZEO
Commits
ec410309
Commit
ec410309
authored
May 19, 2003
by
Christian Robottom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fix to Connection.commit to make sure it passes the correct object
information to ReadConflictError
parent
22d17a7a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/ZODB/Connection.py
src/ZODB/Connection.py
+2
-2
No files found.
src/ZODB/Connection.py
View file @
ec410309
...
...
@@ -13,7 +13,7 @@
##############################################################################
"""Database connection support
$Id: Connection.py,v 1.9
2 2003/05/08 22:43:07 jeremy
Exp $"""
$Id: Connection.py,v 1.9
3 2003/05/19 15:40:58 kiko
Exp $"""
from
__future__
import
nested_scopes
...
...
@@ -317,7 +317,7 @@ class Connection(ExportImport.ExportImport):
oid
=
object
.
_p_oid
if
self
.
_conflicts
.
has_key
(
oid
):
self
.
getTransaction
().
register
(
object
)
raise
ReadConflictError
(
o
id
)
raise
ReadConflictError
(
o
bject
=
object
)
invalid
=
self
.
_invalid
if
oid
is
None
or
object
.
_p_jar
is
not
self
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment