Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 593CAC0DA for ; Mon, 17 Mar 2014 12:06:14 +0000 (UTC) Received: (qmail 85542 invoked by uid 500); 17 Mar 2014 12:06:13 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 85517 invoked by uid 500); 17 Mar 2014 12:06:13 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 85445 invoked by uid 99); 17 Mar 2014 12:06:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Mar 2014 12:06:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Mar 2014 12:06:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DF114238883D; Mon, 17 Mar 2014 12:05:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1578326 - /subversion/trunk/subversion/libsvn_ra_serf/lock.c Date: Mon, 17 Mar 2014 12:05:46 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140317120546.DF114238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Mon Mar 17 12:05:46 2014 New Revision: 1578326 URL: http://svn.apache.org/r1578326 Log: * subversion/libsvn_ra_serf/lock.c (svn_ra_serf__unlock): Following up on r1578311, remove the now invalid assumption that serf's get_lock will always return a lock instance, even when a node isn't locked. Modified: subversion/trunk/subversion/libsvn_ra_serf/lock.c Modified: subversion/trunk/subversion/libsvn_ra_serf/lock.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/lock.c?rev=1578326&r1=1578325&r2=1578326&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_serf/lock.c (original) +++ subversion/trunk/subversion/libsvn_ra_serf/lock.c Mon Mar 17 12:05:46 2014 @@ -564,7 +564,7 @@ svn_ra_serf__unlock(svn_ra_session_t *ra err = svn_ra_serf__get_lock(ra_session, &existing_lock, path, iterpool); - if (!err && existing_lock->token) + if (!err && existing_lock) { svn_hash_sets(path_tokens, path, apr_pstrdup(scratch_pool, existing_lock->token));