You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2011/07/24 04:54:06 UTC

svn commit: r1150260 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Author: rhuijben
Date: Sun Jul 24 02:54:05 2011
New Revision: 1150260

URL: http://svn.apache.org/viewvc?rev=1150260&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
  (get_writable_proto_rev_body): Compose cleanup errors instead of just
    clearing them.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1150260&r1=1150259&r2=1150260&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sun Jul 24 02:54:05 2011
@@ -826,8 +826,10 @@ get_writable_proto_rev_body(svn_fs_t *fs
 
   if (err)
     {
-      svn_error_clear(unlock_proto_rev_list_locked(fs, txn_id, *lockcookie,
-                                                   pool));
+      err = svn_error_compose_create(
+              err,
+              unlock_proto_rev_list_locked(fs, txn_id, *lockcookie, pool));
+      
       *lockcookie = NULL;
     }