--------------------- PatchSet 3828 Date: 2006/10/03 22:21:30 Author: rousskov Branch: squid3-icap Tag: (none) Log: - Removed misplaced level-1 debugging. Members: src/ICAP/ICAPXaction.cc:1.1.2.5->1.1.2.6 Index: squid3/src/ICAP/ICAPXaction.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.cc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid3/src/ICAP/ICAPXaction.cc 3 Oct 2006 22:14:53 -0000 1.1.2.5 +++ squid3/src/ICAP/ICAPXaction.cc 3 Oct 2006 22:21:30 -0000 1.1.2.6 @@ -239,12 +239,8 @@ bool ICAPXaction::done() const { - if (stopReason != NULL) { // mustStop() has been called - debugs(93,1,HERE << "ICAPXaction is done() because " << stopReason); - return true; - } - - return doneAll(); + // stopReason, set in mustStop(), overwrites all other conditions + return stopReason != NULL || doneAll(); } bool ICAPXaction::doneAll() const