From commits-return-5473-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Mar 14 14:19:10 2008 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 99643 invoked from network); 14 Mar 2008 14:19:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Mar 2008 14:19:09 -0000 Received: (qmail 39107 invoked by uid 500); 14 Mar 2008 14:19:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 39076 invoked by uid 500); 14 Mar 2008 14:19:06 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 39067 invoked by uid 99); 14 Mar 2008 14:19:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Mar 2008 07:19:06 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Mar 2008 14:18:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84C8E1A9832; Fri, 14 Mar 2008 07:18:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r637106 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Date: Fri, 14 Mar 2008 14:18:44 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080314141845.84C8E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri Mar 14 07:18:38 2008 New Revision: 637106 URL: http://svn.apache.org/viewvc?rev=637106&view=rev Log: JCR-1461: Deadlock on concurrent commit/checkin operations - Applied Marcel's patch Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=637106&r1=637105&r2=637106&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Fri Mar 14 07:18:38 2008 @@ -380,11 +380,15 @@ * @throws RepositoryException if an error occurs */ public AbstractLockInfo getLockInfo(NodeId id) throws RepositoryException { - acquire(); - + Path path; try { - Path path = getPath(id); + path = getPath(id); + } catch (ItemNotFoundException e) { + return null; + } + acquire(); + try { PathMap.Element element = lockMap.map(path, false); AbstractLockInfo info = (AbstractLockInfo) element.get(); if (info != null) { @@ -392,8 +396,6 @@ return info; } } - return null; - } catch (ItemNotFoundException e) { return null; } finally { release();