Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 74121 invoked from network); 13 Mar 2007 08:34:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2007 08:34:02 -0000 Received: (qmail 47991 invoked by uid 500); 13 Mar 2007 08:34:11 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 47926 invoked by uid 500); 13 Mar 2007 08:34:11 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 47914 invoked by uid 99); 13 Mar 2007 08:34:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 01:34:11 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Tue, 13 Mar 2007 01:34:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 215171A9838; Tue, 13 Mar 2007 01:33:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517588 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java Date: Tue, 13 Mar 2007 08:33:41 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070313083342.215171A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Tue Mar 13 01:33:40 2007 New Revision: 517588 URL: http://svn.apache.org/viewvc?view=rev&rev=517588 Log: DERBY-1704: Allow more concurrency in the lock manager Simplified LockControl.popFrontWaiter(). Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java?view=diff&rev=517588&r1=517587&r2=517588 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java Tue Mar 13 01:33:40 2007 @@ -638,11 +638,7 @@ * @return The removed lock request */ private Object popFrontWaiter(List waiting, LockTable ls) { - // Maintain count of waiters - ls.oneLessWaiter(); - - // Remove and return the first lock request - return waiting.remove(0); + return removeWaiter(waiting, 0, ls); }