From 67d0b808b76e0657afdebb4012b398be003766a9 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 18 Sep 2010 06:39:09 -0600 Subject: [PATCH] Author: Alex Rousskov Removed erroneous !theEntries.empty() Must() in Adaptation::History. The "we need history" state of the retried transaction may be different from that of the original one due to reconfigurations, routing responses, etc. Based on lp 3p1-rock branch, r9622. --- src/adaptation/History.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc index 4733b5aef3..a43c09be18 100644 --- a/src/adaptation/History.cc +++ b/src/adaptation/History.cc @@ -39,10 +39,10 @@ Adaptation::History::History(): theNextServices(TheNullServices) int Adaptation::History::recordXactStart(const String &serviceId, const timeval &when, bool retrying) { - if (retrying) { - Must(!theEntries.empty()); // or there would be nothing to retry + // the history will be empty on retries if it was enabled after the failure + if (retrying && !theEntries.empty()) theEntries.back().retried = true; - } + theEntries.push_back(Adaptation::History::Entry(serviceId, when)); return theEntries.size() - 1; // record position becomes history ID } -- 2.47.3