svn commit: r1704017 - /subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c

[iv...@apache.org]

Author: ivan
Date: Sat Sep 19 13:16:07 2015
New Revision: 1704017

URL: http://svn.apache.org/viewvc?rev=1704017&view=rev
Log:
On the reuse-ra-session branch: Simplify code a bit.

* subversion/libsvn_client/commit.c
  (svn_client_commit6): Use plain SVN_ERR() macros since we're releasing RA
   session back only on non-error condition.

Modified:
    subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c

Modified: subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c?rev=1704017&r1=1704016&r2=1704017&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c Sat Sep 19 13:16:07 2015
@@ -980,13 +980,10 @@ svn_client_commit6(const apr_array_heade
 
   svn_pool_destroy(iterpool);
 
-  {
-    svn_error_t *const final_err =
-      svn_error_trace(reconcile_errors(cmt_err, unlock_err, bump_err, pool));
+  SVN_ERR(reconcile_errors(cmt_err, unlock_err, bump_err, pool));
 
-    if (!final_err && ra_session)
-      SVN_ERR(svn_client__ra_session_release(ctx, ra_session));
+  if (ra_session)
+    SVN_ERR(svn_client__ra_session_release(ctx, ra_session));
 
-    return final_err;
-  }
+  return SVN_NO_ERROR;
 }