Attachment 858071 Details for Bug 1060114 – Patch committed to upstream

[patch] Patch committed to upstream

QPID-5530.new.patch (text/plain), 1.15 KB, created by Pavel Moravec on 2014-02-01 10:48:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2014-02-01 10:48:24 UTC

Size: 1.15 KB

patch

obsolete

>Index: tools/src/py/qpidstore/janal.py
>===================================================================
>--- tools/src/py/qpidstore/janal.py	(revision 1562852)
>+++ tools/src/py/qpidstore/janal.py	(working copy)
>@@ -215,9 +215,18 @@
>     
>     def _abort(self, xid):
>         """Perform an abort operation for the given xid record"""
>-        for fid, hdr, lock in self.__map[xid]:
>+        for _, hdr, _ in self.__map[xid]:
>             if isinstance(hdr, jrnl.DeqRec):
>-                self.__emap.unlock(hdr.deq_rid)
>+                try:
>+                    self.__emap.unlock(hdr.deq_rid)
>+                except jerr.NonExistentRecordError as err: # Not in emap, look in current transaction op list (TPL)
>+                    found_rid = False
>+                    for _, hdr1, _ in self.__map[xid]:
>+                        if isinstance(hdr1, jrnl.EnqRec) and hdr1.rid == hdr.deq_rid:
>+                            found_rid = True
>+                            break
>+                    if not found_rid: # Not found in current transaction op list, re-throw error
>+                        raise err
>         del self.__map[xid]
>     
>     def _commit(self, xid):

Actions: View | Diff

Attachments on bug 1060114: 857799 | 858071