svn commit: r1720299 - /subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c

[ivan]

Author: ivan
Date: Wed Dec 16 07:28:22 2015
New Revision: 1720299

URL: http://svn.apache.org/viewvc?rev=1720299&view=rev
Log:
On 'parrallel-put' branch: Simplify code. No functional changes intended.

* subversion/tests/libsvn_fs/fs-test.c
  (get_shared_txn): Use if/else if instead of nested condition.

Modified:
    subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c

Modified: subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c?rev=1720299&r1=1720298&r2=1720299&view=diff
==============================================================================
--- subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c 
(original)
+++ subversion/branches/parallel-put/subversion/libsvn_fs_fs/transaction.c Wed 
Dec 16 07:28:22 2015
@@ -160,23 +160,18 @@ get_shared_txn(fs_fs_shared_txn_data_t *
        * setting where some external scheme prevents actual races between
        * them.  However, we consider such a setup illegal (and theoretical).
        */
-      if (txn->is_concurrent != ffd->concurrent_txns)
-        {
-          if (txn->is_concurrent)
-            return svn_error_createf(SVN_ERR_FS_TXN_CONCURRENCY_MISMATCH,
-                                     NULL,
-                                     _("Cannot reopen transaction '%s' "
-                                       "without concurrent write support"),
-                                     svn_fs_fs__id_txn_unparse(txn_id,
-                                                               fs->pool));
-          else
-            return svn_error_createf(SVN_ERR_FS_TXN_CONCURRENCY_MISMATCH,
-                                     NULL,
-                                     _("Cannot reopen transaction '%s' "
-                                       "with concurrent write support"),
-                                     svn_fs_fs__id_txn_unparse(txn_id,
-                                                               fs->pool));
-        }
+       if (txn->is_concurrent && !ffd->concurrent_txns)
+         return svn_error_createf(SVN_ERR_FS_TXN_CONCURRENCY_MISMATCH, NULL,
+                                  _("Cannot reopen transaction '%s' "
+                                    "without concurrent write support"),
+                                  svn_fs_fs__id_txn_unparse(txn_id,
+                                                            fs->pool));
+       else if (!txn->is_concurrent && ffd->concurrent_txns)
+         return svn_error_createf(SVN_ERR_FS_TXN_CONCURRENCY_MISMATCH, NULL,
+                                  _("Cannot reopen transaction '%s' "
+                                    "with concurrent write support"),
+                                  svn_fs_fs__id_txn_unparse(txn_id,
+                                                            fs->pool));
 
       *txn_p = txn;
       return SVN_NO_ERROR;