diff options
author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/llcommon/llapr.cpp | |
parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
parent | bd897431e14aff091d5f45425816ddec4b2538c7 (diff) |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/llcommon/llapr.cpp')
-rw-r--r-- | indra/llcommon/llapr.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index 7330b00bcf..dca4cf7c3f 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -417,7 +417,11 @@ apr_pool_t* LLAPRFile::getAPRFilePool(apr_pool_t* pool) // File I/O S32 LLAPRFile::read(void *buf, S32 nbytes) { - llassert_always(mFile) ; + if(!mFile) + { + llwarns << "apr mFile is removed by somebody else. Can not read." << llendl ; + return 0; + } apr_size_t sz = nbytes; apr_status_t s = apr_file_read(mFile, buf, &sz); @@ -435,7 +439,11 @@ S32 LLAPRFile::read(void *buf, S32 nbytes) S32 LLAPRFile::write(const void *buf, S32 nbytes) { - llassert_always(mFile) ; + if(!mFile) + { + llwarns << "apr mFile is removed by somebody else. Can not write." << llendl ; + return 0; + } apr_size_t sz = nbytes; apr_status_t s = apr_file_write(mFile, buf, &sz); |