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/04/15 13:05:00 UTC

svn commit: r1587514 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c

Author: philip
Date: Tue Apr 15 11:05:00 2014
New Revision: 1587514

URL: http://svn.apache.org/r1587514
Log:
* subversion/libsvn_fs/fs-loader.c
  (svn_fs_lock_many): Don't invoke callback if it is NULL.

Modified:
    subversion/trunk/subversion/libsvn_fs/fs-loader.c

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1587514&r1=1587513&r2=1587514&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Apr 15 11:05:00 2014
@@ -1644,7 +1644,7 @@ svn_fs_lock_many(svn_fs_t *fs,
 
       if (err)
         {
-          if (!cb_err)
+          if (!cb_err && lock_callback)
             cb_err = lock_callback(lock_baton, svn__apr_hash_index_key(hi),
                                    NULL, err, scratch_pool);
           svn_error_clear(err);