---------------------
PatchSet 3837 
Date: 2006/10/06 16:48:08
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Check that the ICAP service is "up" when we receive notification, not when
  we start writing. This change may make the code more clear, but should not
  affect its functionality.

Members: 
	src/ICAP/ICAPModXact.cc:1.1.2.12->1.1.2.13 

Index: squid3/src/ICAP/ICAPModXact.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPModXact.cc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- squid3/src/ICAP/ICAPModXact.cc	4 Oct 2006 19:34:04 -0000	1.1.2.12
+++ squid3/src/ICAP/ICAPModXact.cc	6 Oct 2006 16:48:08 -0000	1.1.2.13
@@ -124,15 +124,16 @@
 
     Must(state.serviceWaiting);
     state.serviceWaiting = false;
-    startWriting(); // will throw if service is not up
+
+    Must(service().up());
+
+    startWriting();
 
     ICAPXaction_Exit();
 }
 
 void ICAPModXact::startWriting()
 {
-    Must(service().up());
-
     state.writing = State::writingConnect;
     openConnection();
     // put nothing here as openConnection calls commConnectStart