svn commit: r1581827 - /subversion/trunk/subversion/libsvn_ra_svn/editorp.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 26 13:25:46 2014
New Revision: 1581827

URL: http://svn.apache.org/r1581827
Log:
* subversion/libsvn_ra_svn/editorp.c
  (svn_ra_svn_drive_editor2): Compose error chains instead of just clearing
    possible errors.

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/editorp.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1581827&r1=1581826&r2=1581827&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Mar 26 13:25:46 2014
@@ -982,7 +982,12 @@ svn_error_t *svn_ra_svn_drive_editor2(sv
             {
               /* Abort the edit and use non-blocking I/O to write the error. */
               if (editor)
-                svn_error_clear(editor->abort_edit(edit_baton, subpool));
+                {
+                  err = svn_error_compose_create(
+                          err,
+                          svn_error_trace(editor->abort_edit(edit_baton,
+                                                             subpool)));
+                }
               svn_ra_svn__set_block_handler(conn, blocked_write, &state);
             }
           write_err = svn_ra_svn__write_cmd_failure(
@@ -991,7 +996,7 @@ svn_error_t *svn_ra_svn_drive_editor2(sv
           if (!write_err)
             write_err = svn_ra_svn__flush(conn, subpool);
           svn_ra_svn__set_block_handler(conn, NULL, NULL);
-          svn_error_clear(err);
+          svn_error_clear(err); /* We just sent this error */
           SVN_ERR(write_err);
           break;
         }