---------------------
PatchSet 5573 
Date: 2002/12/31 17:45:27
Author: ymc
Branch: dtd
Tag: (none) 
Log:
looks like it is stable now

Members: 
	src/client_side.c:1.5.2.9.2.11.2.5->1.5.2.9.2.11.2.6 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.5.2.9.2.11.2.5
retrieving revision 1.5.2.9.2.11.2.6
diff -u -r1.5.2.9.2.11.2.5 -r1.5.2.9.2.11.2.6
--- squid/src/client_side.c	30 Dec 2002 23:06:40 -0000	1.5.2.9.2.11.2.5
+++ squid/src/client_side.c	31 Dec 2002 17:45:27 -0000	1.5.2.9.2.11.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.5.2.9.2.11.2.5 2002/12/30 23:06:40 ymc Exp $
+ * $Id: client_side.c,v 1.5.2.9.2.11.2.6 2002/12/31 17:45:27 ymc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1361,9 +1361,8 @@
 	StoreEntry * op = http->entry->p;
         p = storeGet(op->hash.key);	
 	http->entry = NULL;
-	storeUnregister(http->sc, e->p, http);
-	http->sc = NULL;
 	if (p && p != op) {
+	storeUnregister(http->sc, e->p, http);
 	    arrayDelete(op->instances, e);
 	    if (e->p->store_status == STORE_OK)
 	    e->p = p;
@@ -1371,8 +1370,13 @@
 		p->mem_obj = op->mem_obj;
      		op->mem_obj = NULL;		
 	    }	   
-	}   
 	storeUnlockObject(op);
+	}
+        if (p == NULL) {
+	storeUnregister(http->sc, e->p, http);
+	storeUnlockObject(op);
+	}
+	http->sc = NULL;
 //	if (EBIT_TEST(e->flags, RELEASE_REQUEST))
 //	    instanceRelease(e);
 #else