---------------------
PatchSet 5821 
Date: 2003/07/12 11:28:41
Author: hno
Branch: collapsed_forwarding-2_5
Tag: (none) 
Log:
make sure the IMS entry reference is reset in all cases of IMS processing

Members: 
	src/client_side.c:1.47.2.31.4.6->1.47.2.31.4.7 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.47.2.31.4.6
retrieving revision 1.47.2.31.4.7
diff -u -r1.47.2.31.4.6 -r1.47.2.31.4.7
--- squid/src/client_side.c	12 Jul 2003 11:08:21 -0000	1.47.2.31.4.6
+++ squid/src/client_side.c	12 Jul 2003 11:28:41 -0000	1.47.2.31.4.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.47.2.31.4.6 2003/07/12 11:08:21 hno Exp $
+ * $Id: client_side.c,v 1.47.2.31.4.7 2003/07/12 11:28:41 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -506,6 +506,10 @@
     }
     mem = entry->mem_obj;
     status = mem->reply->sline.status;
+    if (mem && mem->ims_entry) {
+	storeUnlockObject(mem->ims_entry);
+	mem->ims_entry = NULL;
+    }
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 	debug(33, 3) ("clientHandleIMSReply: ABORTED '%s'\n", url);
 	/* We have an existing entry, but failed to validate it */
@@ -577,10 +581,6 @@
     }
     http->old_entry = NULL;	/* done with old_entry */
     http->old_sc = NULL;
-    if (entry->mem_obj && entry->mem_obj->ims_entry) {
-	storeUnlockObject(entry->mem_obj->ims_entry);
-	entry->mem_obj->ims_entry = NULL;
-    }
     assert(!EBIT_TEST(entry->flags, ENTRY_ABORTED));
     if (recopy) {
 	storeClientCopy(http->sc, entry,