Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 78272 invoked from network); 10 Feb 2005 12:47:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Feb 2005 12:47:19 -0000 Received: (qmail 37341 invoked by uid 500); 10 Feb 2005 12:47:18 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 37321 invoked by uid 500); 10 Feb 2005 12:47:18 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 37308 invoked by uid 99); 10 Feb 2005 12:47:18 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from mail.seitenbau.net (HELO mail.seitenbau.net) (194.175.229.106) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 10 Feb 2005 04:47:16 -0800 Received: from [195.127.188.18] (helo=www.seitenbau.net) by router1.seitenbau.net with esmtp (Exim 4.43) id 1CzDj0-000764-0N for torque-dev@db.apache.org; Thu, 10 Feb 2005 13:47:14 +0100 In-Reply-To: <420A5709.4040302@tewisoft.de> Subject: Re: cvs organisation: HEAD as active development branch To: "Apache Torque Developers List" X-Mailer: Lotus Notes Release 6.0 September 26, 2002 Message-ID: From: Thomas Fischer Date: Thu, 10 Feb 2005 13:47:12 +0100 X-MIMETrack: Serialize by Router on www/seitenbau(Release 6.5.1|January 21, 2004) at 10.02.2005 01:47:12 PM MIME-Version: 1.0 Content-type: text/plain; charset=US-ASCII X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Hi Thomas I will commit the patch in the next days. Remind me if I forget it. Thomas Thomas Vandahl schrieb am 09.02.2005 19:31:37: > Hi Thomas, > > > Considering the amount of changes, I would propose to call the next release > > 3.2, and therefore abandon the TORQUE_3_1_BRANCH. > > If someone feels it necessary to do further commits to the > > TORQUE_3_1_BRANCH, PLEASE also commit the changes to HEAD, if it makes any > > sense. > > Would you please introduce the attached patch into LargeSelect.java. It > was posted here in the list some time ago by someone else and deals with > the infamous ConcurrentModificationException in the thread code. I > thought the patch had made it already into the CVS but I found it > missing in the new HEAD. > > (BTW: Your join patches work quite well in my application. The tests > were all successful!) > > Bye, Thomas. > --- LargeSelect.java.orig Wed Feb 9 19:22:04 2005 > +++ LargeSelect.java Wed Feb 9 19:28:48 2005 > @@ -624,7 +624,13 @@ > + "fromIndex + Math.min(size, results.size() - > fromIndex) (" > + toIndex + ")"); > } > - List returnResults = results.subList(fromIndex, toIndex); > + > + List returnResults; > + > + synchronized (results) > + { > + returnResults = new ArrayList(results. > subList(fromIndex, toIndex)); > + } > > if (null != returnBuilderClass) > { > @@ -705,9 +711,12 @@ > List tempResults > = BasePeer.getSelectResults(qds, size, false); > > - for (int i = 0, n = tempResults.size(); i < n; i++) > + synchronized (results) > { > - results.add(tempResults.get(i)); > + for (int i = 0, n = tempResults.size(); i < n; i++) > + { > + results.add(tempResults.get(i)); > + } > } > > currentlyFilledTo += tempResults.size(); > @@ -717,7 +726,10 @@ > // on the last page but we must now get rid of it. > if (results.size() == memoryLimit + 1) > { > - results.remove(currentlyFilledTo--); > + synchronized (results) > + { > + results.remove(currentlyFilledTo--); > + } > perhapsLastPage = false; > } > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org > For additional commands, e-mail: torque-dev-help@db.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org