[rhmessaging-commits] rhmessaging commits: r4490 - store/trunk/cpp/tools/qpidstore.

Author: kpvdr Date: 2012-01-06 15:41:19 -0500 (Fri, 06 Jan 2012) New Revision: 4490 Modified: store/trunk/cpp/tools/qpidstore/janal.py Log: BZ 772326 - Store tool store_chk fails with "ValueError: too many values to unpack" when transactional abort encountered in journal Modified: store/trunk/cpp/tools/qpidstore/janal.py =================================================================== --- store/trunk/cpp/tools/qpidstore/janal.py 2012-01-04 19:28:32 UTC (rev 4489) +++ store/trunk/cpp/tools/qpidstore/janal.py 2012-01-06 20:41:19 UTC (rev 4490) @@ -219,9 +219,9 @@ def _abort(self, xid): """Perform an abort operation for the given xid record""" - for fid, hdr in self.__map[xid]: + for fid, hdr, lock in self.__map[xid]: if isinstance(hdr, jrnl.DeqRec): - self.__emap.unlock(hdr.rid) + self.__emap.unlock(hdr.deq_rid) del self.__map[xid] def _commit(self, xid):