From fae92a2df852992216eb24418a1dd0b676696bee Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 15 Apr 2010 16:55:34 +0100
Subject: some clean-up of lllfsthread to help me understand it, remove one
 extraneous close().  to be reviewed by bao. (transplanted from
 17c6af7a2396f9890aab8226356a556b4d58a7d8)

---
 indra/llvfs/lllfsthread.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp
index e85cc437f4..49c198a82d 100644
--- a/indra/llvfs/lllfsthread.cpp
+++ b/indra/llvfs/lllfsthread.cpp
@@ -188,7 +188,7 @@ bool LLLFSThread::Request::processRequest()
 	if (mOperation ==  FILE_READ)
 	{
 		llassert(mOffset >= 0);
-		LLAPRFile infile ;
+		LLAPRFile infile ; // auto-closes
 		infile.open(mFileName, LL_APR_RB, mThread->getLocalAPRFilePool());
 		if (!infile.getFileHandle())
 		{
@@ -204,7 +204,6 @@ bool LLLFSThread::Request::processRequest()
 		llassert_always(off >= 0);
 		mBytesRead = infile.read(mBuffer, mBytes );
 		complete = true;
-		infile.close() ;
 // 		llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl;
 	}
 	else if (mOperation ==  FILE_WRITE)
@@ -212,7 +211,7 @@ bool LLLFSThread::Request::processRequest()
 		apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
 		if (mOffset < 0)
 			flags |= APR_APPEND;
-		LLAPRFile outfile ;
+		LLAPRFile outfile ; // auto-closes
 		outfile.open(mFileName, flags, mThread->getLocalAPRFilePool());
 		if (!outfile.getFileHandle())
 		{
@@ -232,7 +231,6 @@ bool LLLFSThread::Request::processRequest()
 		}
 		mBytesRead = outfile.write(mBuffer, mBytes );
 		complete = true;
-
 // 		llinfos << "LLLFSThread::WRITE:" << mFileName << " Bytes: " << mBytesRead << "/" << mBytes << " Offset:" << mOffset << llendl;
 	}
 	else
-- 
cgit v1.2.3


From 492efd6678f2f9db8d66b0bde5136bc1e5740cbb Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 16 Apr 2010 09:25:40 +0300
Subject: Fixed EXT-6423(normal) - Windows viewer spends a minute clearing
 cache when there is no cache Problem description: The code that purges cache
 does not expect any folders there, error occurs when it tries to delete a
 file, which is actually a folder. To handle an error the code sleeps for 1
 second and tries to delete the file 4 more times(sleeping for 1 second after
 each try). Fix info: Using LLFile::isDir to skip directories and only delete
 files.

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/239/

--HG--
branch : product-engine
---
 indra/llvfs/lldir.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index da4abde451..29b6f490c8 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -91,15 +91,16 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask)
 	S32 result;
 	while (getNextFileInDir(dirname, mask, filename, FALSE))
 	{
-		if ((filename == ".") || (filename == ".."))
+		fullpath = dirname;
+		fullpath += getDirDelimiter();
+		fullpath += filename;
+
+		if(LLFile::isdir(fullpath))
 		{
 			// skipping directory traversal filenames
 			count++;
 			continue;
 		}
-		fullpath = dirname;
-		fullpath += getDirDelimiter();
-		fullpath += filename;
 
 		S32 retry_count = 0;
 		while (retry_count < 5)
-- 
cgit v1.2.3