← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/adaptation/Iterator.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/Iterator.cc
14
14
#include "adaptation/ServiceGroups.h"
15
15
 
16
16
 
17
 
Adaptation::Iterator::Iterator(Adaptation::Initiator *anInitiator,
18
 
                               HttpMsg *aMsg, HttpRequest *aCause,
19
 
                               const ServiceGroupPointer &aGroup):
 
17
Adaptation::Iterator::Iterator(
 
18
    HttpMsg *aMsg, HttpRequest *aCause,
 
19
    const ServiceGroupPointer &aGroup):
20
20
        AsyncJob("Iterator"),
21
 
        Adaptation::Initiate("Iterator", anInitiator),
 
21
        Adaptation::Initiate("Iterator"),
22
22
        theGroup(aGroup),
23
23
        theMsg(HTTPMSGLOCK(aMsg)),
24
24
        theCause(aCause ? HTTPMSGLOCK(aCause) : NULL),
69
69
    debugs(93,5, HERE << "using adaptation service: " << service->cfg().key);
70
70
 
71
71
    theLauncher = initiateAdaptation(
72
 
                      service->makeXactLauncher(this, theMsg, theCause));
73
 
    Must(theLauncher);
 
72
                      service->makeXactLauncher(theMsg, theCause));
 
73
    Must(initiated(theLauncher));
74
74
    Must(!done());
75
75
}
76
76
 
148
148
 
149
149
void Adaptation::Iterator::swanSong()
150
150
{
151
 
    if (theInitiator)
 
151
    if (theInitiator.set())
152
152
        tellQueryAborted(true); // abnormal condition that should not happen
153
153
 
154
 
    if (theLauncher)
 
154
    if (initiated(theLauncher))
155
155
        clearAdaptation(theLauncher);
156
156
 
157
157
    Adaptation::Initiate::swanSong();