Return-Path: Delivered-To: apmail-db-derby-dev-archive@www.apache.org Received: (qmail 51622 invoked from network); 9 Mar 2008 14:00:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Mar 2008 14:00:46 -0000 Received: (qmail 97875 invoked by uid 500); 9 Mar 2008 14:00:43 -0000 Delivered-To: apmail-db-derby-dev-archive@db.apache.org Received: (qmail 97834 invoked by uid 500); 9 Mar 2008 14:00:42 -0000 Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: Delivered-To: mailing list derby-dev@db.apache.org Received: (qmail 97824 invoked by uid 99); 9 Mar 2008 14:00:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Mar 2008 07:00:42 -0700 X-ASF-Spam-Status: No, hits=-1.0 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [192.18.6.21] (HELO gmp-eb-inf-1.sun.com) (192.18.6.21) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Mar 2008 13:59:53 +0000 Received: from fe-emea-09.sun.com (gmp-eb-lb-2-fe2.eu.sun.com [192.18.6.11]) by gmp-eb-inf-1.sun.com (8.13.7+Sun/8.12.9) with ESMTP id m29E05d4029283 for ; Sun, 9 Mar 2008 14:00:11 GMT Received: from conversion-daemon.fe-emea-09.sun.com by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) id <0JXG00H01UJSBC00@fe-emea-09.sun.com> (original mail from Dyre.Tjeldvoll@Sun.COM) for derby-dev@db.apache.org; Sun, 09 Mar 2008 14:00:04 +0000 (GMT) Received: from khepri32.sun.com ([129.159.112.244]) by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTPSA id <0JXG00K4YUW4VX00@fe-emea-09.sun.com> for derby-dev@db.apache.org; Sun, 09 Mar 2008 14:00:04 +0000 (GMT) Date: Sun, 09 Mar 2008 15:00:04 +0100 From: Dyre.Tjeldvoll@Sun.COM Subject: Preparing to cut the 10.4 branch Sender: Dyre.Tjeldvoll@Sun.COM To: Derby Development Message-id: MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (usg-unix-v) X-Virus-Checked: Checked by ClamAV on apache.org We have now passed the feature freeze point (2008-03-08 00:00 GMT-12) and I have started to look for a suitable revision from which to cut the branch. My subversion client reports times using the CET (GMT+1) timezone so if my math is correct all revisions created prior to 2008-03-08 13:00 CET should be on the branch. This means that the earilest revision which can be used for branching is ------------------------------------------------------------------------ r634896 | mikem | 2008-03-08 04:52:19 +0100 (Sat, 08 Mar 2008) | 6 lines DERBY-3456 Clean up comments and adjust newly added code to match style of surrounding code. ------------------------------------------------------------------------ There appears to have been 3 checkins after that: ------------------------------------------------------------------------ r634993 | djd | 2008-03-08 17:00:27 +0100 (Sat, 08 Mar 2008) | 1 line DERBY-2109 Minor cleanup of the security code added for system permissions to ch ange methods not to be public, add a minor comment and fix a file header ------------------------------------------------------------------------ r635115 | djd | 2008-03-09 00:56:05 +0100 (Sun, 09 Mar 2008) | 2 lines DERBY-3435 Implements a new test class for the NetworkServerMBean and adds it to the management test suite. All attributes are tested, although testing of the a ctual attribute values could be improved (see code comments). Attribute names an d return types are always tested. Contributed by John H. Embretsen Email: John dot Embretsen at Sun dot com ------------------------------------------------------------------------ r635183 | kahatlen | 2008-03-09 08:33:41 +0100 (Sun, 09 Mar 2008) | 16 lines DERBY-2911: Implement a buffer manager using java.util.concurrent classes DERBY-3493: stress.multi times out waiting on testers with blocked testers waiti ng on the same statement Changed ConcurrentCache.create() to match Clock.create() more closely. The patch basically makes ConcurrentCache.create() use ConcurrentHashMap.get() directly instead of going through ConcurrentCache.getEntry(), which may block until the identity has been set by another thread. Then create() fails immediately if the object already exists in the cache, also if another thread is in the process of inserting the object into the cache. Since this introduced yet another difference between find() and create() in findOrCreateObject(), I also followed ?\195?\152ystein's suggestion from his review of DERBY-2911 and split findOrCreateObject() into a number of smaller methods, which I think makes the code easier to follow. ------------------------------------------------------------------------ They all seem like bug fixes that would need to be merged to the new branch so unless I hear otherwise, I plan to cut the branch(es) from revision 635183. I plan to do this early on Monday (CET). Thanks, -- dt