You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/17 13:07:49 UTC
svn commit: r1578327 - in /subversion/branches/1.8.x-r1578311: ./
subversion/libsvn_ra_serf/locks.c
Author: rhuijben
Date: Mon Mar 17 12:07:49 2014
New Revision: 1578327
URL: http://svn.apache.org/r1578327
Log:
Record a merge of r1578326, and apply a similar fix on the branch
Modified:
subversion/branches/1.8.x-r1578311/ (props changed)
subversion/branches/1.8.x-r1578311/subversion/libsvn_ra_serf/locks.c
Propchange: subversion/branches/1.8.x-r1578311/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1578326
Modified: subversion/branches/1.8.x-r1578311/subversion/libsvn_ra_serf/locks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1578311/subversion/libsvn_ra_serf/locks.c?rev=1578327&r1=1578326&r2=1578327&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1578311/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/branches/1.8.x-r1578311/subversion/libsvn_ra_serf/locks.c Mon Mar 17 12:07:49 2014
@@ -580,7 +580,7 @@ svn_ra_serf__unlock(svn_ra_session_t *ra
{
SVN_ERR(svn_ra_serf__get_lock(ra_session, &existing_lock, path,
iterpool));
- token = existing_lock->token;
+ token = existing_lock ? existing_lock->token : NULL;
if (!token)
{
err = svn_error_createf(SVN_ERR_RA_NOT_LOCKED, NULL,