apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1531573 - in /apr/apr/branches/1.5.x: ./ file_io/win32/open.c
Date Sat, 12 Oct 2013 18:43:06 GMT
Author: trawick
Date: Sat Oct 12 18:43:05 2013
New Revision: 1531573

URL: http://svn.apache.org/r1531573
Log:
Merge r746310 from trunk:

Do not close the original if the apr_os_file_put fails.
This ensures the same behavior as on other platforms

Submitted by: mturk

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/file_io/win32/open.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r746310

Modified: apr/apr/branches/1.5.x/file_io/win32/open.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/file_io/win32/open.c?rev=1531573&r1=1531572&r2=1531573&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/file_io/win32/open.c (original)
+++ apr/apr/branches/1.5.x/file_io/win32/open.c Sat Oct 12 18:43:05 2013
@@ -648,9 +648,6 @@ APR_DECLARE(apr_status_t) apr_os_file_pu
         rv = apr_thread_mutex_create(&(*file)->mutex, 
                                      APR_THREAD_MUTEX_DEFAULT, pool);
         if (rv) {
-            if (file_cleanup(*file) == APR_SUCCESS) {
-                apr_pool_cleanup_kill(pool, *file, file_cleanup);
-            }
             return rv;
         }
     }



Mime
View raw message