[rhmessaging-commits] rhmessaging commits: r4209 - store/trunk/cpp/tools.
Author: kpvdr
Date: 2010-08-13 09:31:44 -0400 (Fri, 13 Aug 2010)
New Revision: 4209
Modified:
store/trunk/cpp/tools/janal.py
store/trunk/cpp/tools/jerr.py
Log:
Fix for BZ 624033 - "Store tools regression - "Dequeuing non-existent rnqueue
record""
Modified: store/trunk/cpp/tools/janal.py
===================================================================
--- store/trunk/cpp/tools/janal.py 2010-08-12 21:52:28 UTC (rev 4208)
+++ store/trunk/cpp/tools/janal.py 2010-08-13 13:31:44 UTC (rev 4209)
@@ -155,11 +155,10 @@
except jerr.JWarning:
# Not in emap, look for rid in tmap
l = self.find_rid(hdr.deq_rid, hdr.xid)
- if l == None:
- raise jerr.DequeueNonExistentEnqueueError(hdr.deq_rid)
- if l[2]:
- raise jerr.AlreadyLockedError(hdr.deq_rid)
- l[2] = True
+ if l != None:
+ if l[2]:
+ raise jerr.AlreadyLockedError(hdr.deq_rid)
+ l[2] = True
if hdr.xid in self.__map:
self.__map[hdr.xid].append([fid, hdr, False]) # append to existing list
else:
Modified: store/trunk/cpp/tools/jerr.py
===================================================================
--- store/trunk/cpp/tools/jerr.py 2010-08-12 21:52:28 UTC (rev 4208)
+++ store/trunk/cpp/tools/jerr.py 2010-08-13 13:31:44 UTC (rev 4209)
@@ -67,7 +67,7 @@
"""Error class for attempting to dequeue a non-existent enqueue record
(rid)"""
def __init__(self, deq_rid):
"""Constructor"""
- Exception.__init__(self, "Dequeuing non-existent rnqueue record:
rid=0x%s" % deq_rid)
+ Exception.__init__(self, "Dequeuing non-existent enqueue record:
rid=0x%s" % deq_rid)
class DuplicateRidError(Exception):
"""Error class for placing duplicate rid into enqueue
map"""