projects / packages / squid.git / blame
| Commit | Line | Data |
|---|---|---|
| 36aa8c36 JR |
1 | Index: squid3/src/StoreIOState.cc |
| 2 | diff -c squid3/src/StoreIOState.cc:1.3 squid3/src/StoreIOState.cc:1.4 | |
| 3 | *** squid3/src/StoreIOState.cc:1.3 Fri Feb 21 15:50:06 2003 | |
| 4 | --- squid3/src/StoreIOState.cc Sun Aug 31 06:44:30 2003 | |
| 5 | *************** | |
| 6 | *** 59,64 **** | |
| 7 | --- 59,66 ---- | |
| 8 | ||
| 9 | storeIOState::~storeIOState() | |
| 10 | { | |
| 11 | + debugs(20,3, "StoreIOState::~StoreIOState: " << this); | |
| 12 | + | |
| 13 | if (read.callback_data) | |
| 14 | cbdataReferenceDone(read.callback_data); | |
| 15 | ||
| 16 | Index: squid3/src/fs/ufs/store_io_ufs.cc | |
| 17 | diff -c squid3/src/fs/ufs/store_io_ufs.cc:1.22 squid3/src/fs/ufs/store_io_ufs.cc:1.23 | |
| 18 | *** squid3/src/fs/ufs/store_io_ufs.cc:1.22 Mon Aug 4 16:14:53 2003 | |
| 19 | --- squid3/src/fs/ufs/store_io_ufs.cc Sun Aug 31 06:44:31 2003 | |
| 20 | *************** | |
| 21 | *** 471,479 **** | |
| 22 | UFSStoreState::doCallback(int errflag) | |
| 23 | { | |
| 24 | debug(79, 3) ("storeUfsIOCallback: errflag=%d\n", errflag); | |
| 25 | - /* We are finished with the file as this is on close or error only.*/ | |
| 26 | - theFile = NULL; | |
| 27 | - | |
| 28 | STIOCB *theCallback = callback; | |
| 29 | callback = NULL; | |
| 30 | ||
| 31 | --- 471,476 ---- | |
| 32 | *************** | |
| 33 | *** 481,486 **** | |
| 34 | --- 478,489 ---- | |
| 35 | ||
| 36 | if (cbdataReferenceValidDone(callback_data, &cbdata) && theCallback) | |
| 37 | theCallback(cbdata, errflag, this); | |
| 38 | + | |
| 39 | + /* We are finished with the file as this is on close or error only.*/ | |
| 40 | + /* This must be the last line, as theFile may be the only object holding | |
| 41 | + * us in memory | |
| 42 | + */ | |
| 43 | + theFile = NULL; | |
| 44 | } | |
| 45 | ||
| 46 | /* ============= THE REAL UFS CODE ================ */ |