← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/adaptation/History.cc

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/adaptation/History.cc
39
39
 
40
40
int Adaptation::History::recordXactStart(const String &serviceId, const timeval &when, bool retrying)
41
41
{
42
 
    if (retrying) {
43
 
        Must(!theEntries.empty()); // or there would be nothing to retry
 
42
    // the history will be empty on retries if it was enabled after the failure
 
43
    if (retrying && !theEntries.empty())
44
44
        theEntries.back().retried = true;
45
 
    }
 
45
 
46
46
    theEntries.push_back(Adaptation::History::Entry(serviceId, when));
47
47
    return theEntries.size() - 1; // record position becomes history ID
48
48
}