svn commit: r1071307 - in /subversion/trunk/subversion/mod_dav_svn: repos.c version.c

[st...@apache.org]

Author: stsp
Date: Wed Feb 16 16:50:22 2011
New Revision: 1071307

URL: http://svn.apache.org/viewvc?rev=1071307&view=rev
Log:
Follow-up to r1071239:

* subversion/mod_dav_svn/version.c
  (dav_svn__push_locks): Don't pass a NULL error to dav_svn__sanitize_error().

* subversion/mod_dav_svn/repos.c
  (get_resource): As above.

Modified:
    subversion/trunk/subversion/mod_dav_svn/repos.c
    subversion/trunk/subversion/mod_dav_svn/version.c

Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1071307&r1=1071306&r2=1071307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Feb 16 16:50:22 2011
@@ -2187,6 +2187,8 @@ get_resource(request_rec *r,
       serr = svn_fs_get_access(&access_ctx, repos->fs);
       if (serr || !access_ctx)
         {
+          if (serr == NULL)
+            serr = svn_error_create(SVN_ERR_FS_LOCK_OWNER_MISMATCH, NULL, NULL);
           return dav_svn__sanitize_error(serr, "Lock token is in request, "
                                          "but no user name",
                                          HTTP_BAD_REQUEST, r);

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1071307&r1=1071306&r2=1071307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Feb 16 16:50:22 2011
@@ -1276,6 +1276,8 @@ dav_svn__push_locks(dav_resource *resour
       /* If an authenticated user name was attached to the request,
          then dav_svn_get_resource() should have already noticed and
          created an fs_access_t in the filesystem.  */
+      if (serr == NULL)
+        serr = svn_error_create(SVN_ERR_FS_LOCK_OWNER_MISMATCH, NULL, NULL);
       return dav_svn__sanitize_error(serr, "Lock token(s) in request, but "
                                      "missing an user name", HTTP_BAD_REQUEST,
                                      resource->info->r);