---------------------
PatchSet 6008 
Date: 2007/10/24 17:20:49
Author: chtsanti
Branch: async-calls
Tag: (none) 
Log:
use the AsyncJob::deleteThis method as "delete this" replacement instead of the
previously commited block "if (inCall) musStop(...) else delete this"

Members: 
	src/Server.cc:1.20.4.1->1.20.4.2 
	src/ftp.cc:1.89.4.1->1.89.4.2 
	src/http.cc:1.122.4.1->1.122.4.2 

Index: squid3/src/Server.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Server.cc,v
retrieving revision 1.20.4.1
retrieving revision 1.20.4.2
diff -u -r1.20.4.1 -r1.20.4.2
--- squid3/src/Server.cc	23 Oct 2007 20:27:51 -0000	1.20.4.1
+++ squid3/src/Server.cc	24 Oct 2007 17:20:49 -0000	1.20.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: Server.cc,v 1.20.4.1 2007/10/23 20:27:51 chtsanti Exp $
+ * $Id: Server.cc,v 1.20.4.2 2007/10/24 17:20:49 chtsanti Exp $
  *
  * DEBUG:
  * AUTHOR: Duane Wessels
@@ -179,10 +179,7 @@
 
     debugs(11,3, HERE << "transaction done");
 
-    if(inCall)
-	mustStop("ServerStateData::quitIfAllDone");
-    else
-	delete this;
+    deleteThis("ServerStateData::quitIfAllDone");
 }
 
 // FTP side overloads this to work around multiple calls to fwd->complete
Index: squid3/src/ftp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ftp.cc,v
retrieving revision 1.89.4.1
retrieving revision 1.89.4.2
diff -u -r1.89.4.1 -r1.89.4.2
--- squid3/src/ftp.cc	23 Oct 2007 20:27:52 -0000	1.89.4.1
+++ squid3/src/ftp.cc	24 Oct 2007 17:20:49 -0000	1.89.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ftp.cc,v 1.89.4.1 2007/10/23 20:27:52 chtsanti Exp $
+ * $Id: ftp.cc,v 1.89.4.2 2007/10/24 17:20:49 chtsanti Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -3429,8 +3429,5 @@
     }
     
     fwd->handleUnregisteredServerEnd();
-    if (inCall)
-        mustStop("FtpStateData::abortTransaction");
-    else
-        delete this;
+    deleteThis("FtpStateData::abortTransaction");
 }
Index: squid3/src/http.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v
retrieving revision 1.122.4.1
retrieving revision 1.122.4.2
diff -u -r1.122.4.1 -r1.122.4.2
--- squid3/src/http.cc	23 Oct 2007 20:27:55 -0000	1.122.4.1
+++ squid3/src/http.cc	24 Oct 2007 17:20:49 -0000	1.122.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.122.4.1 2007/10/23 20:27:55 chtsanti Exp $
+ * $Id: http.cc,v 1.122.4.2 2007/10/24 17:20:49 chtsanti Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1864,10 +1864,7 @@
     }
 
     fwd->handleUnregisteredServerEnd();
-    if (inCall)
-        mustStop("HttpStateData::abortTransaction");
-    else
-        delete this;
+    deleteThis("HttpStateData::abortTransaction");
 }
 
 void