You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/08/12 19:07:55 UTC

svn commit: r1617535 - /subversion/trunk/subversion/tests/libsvn_fs/fs-test.c

Author: philip
Date: Tue Aug 12 17:07:55 2014
New Revision: 1617535

URL: http://svn.apache.org/r1617535
Log:
* subversion/tests/libsvn_fs/fs-test.c
  (reopen_modify_child): Have all return paths invoke apr_thread_exit.

Modified:
    subversion/trunk/subversion/tests/libsvn_fs/fs-test.c

Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1617535&r1=1617534&r2=1617535&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Tue Aug 12 17:07:55 2014
@@ -5326,17 +5326,15 @@ reopen_modify_child(apr_thread_t *tid, v
   svn_fs_root_t *root;
 
   baton->err = svn_fs_open(&fs, baton->fs_path, NULL, baton->pool);
-  if (baton->err)
-    return NULL;
-  baton->err = svn_fs_open_txn(&txn, fs, baton->txn_name, baton->pool);
-  if (baton->err)
-    return NULL;
-  baton->err = svn_fs_txn_root(&root, txn, baton->pool);
-  if (baton->err)
-    return NULL;
-  baton->err = svn_fs_change_node_prop(root, "A", "name",
-                                  svn_string_create("value", baton->pool),
-                                  baton->pool);
+  if (!baton->err)
+    baton->err = svn_fs_open_txn(&txn, fs, baton->txn_name, baton->pool);
+  if (!baton->err)
+    baton->err = svn_fs_txn_root(&root, txn, baton->pool);
+  if (!baton->err)
+    baton->err = svn_fs_change_node_prop(root, "A", "name",
+                                         svn_string_create("value",
+                                                           baton->pool),
+                                         baton->pool);
   svn_pool_destroy(baton->pool);
   apr_thread_exit(tid, 0);
   return NULL;