[mapguide-commits] r6543 - sandbox/adsk/2.3r/Common/Foundation/System

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2012-03-12 01:51:37 -0700 (Mon, 12 Mar 2012)
New Revision: 6543

Modified:
   sandbox/adsk/2.3r/Common/Foundation/System/FileUtil.cpp
Log:
on behalf of Andy Zhang.
Fixed DID http://trac.osgeo.org/mapguide/ticket/1884 on 2.3Reeses branch

Modified: sandbox/adsk/2.3r/Common/Foundation/System/FileUtil.cpp
===================================================================
--- sandbox/adsk/2.3r/Common/Foundation/System/FileUtil.cpp	2012-03-09 16:38:45 UTC (rev 6542)
+++ sandbox/adsk/2.3r/Common/Foundation/System/FileUtil.cpp	2012-03-12 08:51:37 UTC (rev 6543)
@@ -788,7 +788,7 @@
 
     int errCode = ACE_OS::unlink(MG_WCHAR_TO_TCHAR(pathname));
 
-    if (0 != errCode)
+    if (0 != errCode && strict)
     {
         errCode = errno; // This is not thread safe - requires guard
         MgStringCollection arguments;


Property changes on: sandbox/adsk/2.3r/Common/Foundation/System/FileUtil.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /Common/Foundation/System/FileUtil.cpp:5504
/sandbox/adsk/2.2gp/Common/Foundation/System/FileUtil.cpp:6323
/trunk/MgDev/Common/Foundation/System/FileUtil.cpp:5501,5504,5539,5561-5562,5595,6074