Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 12693 invoked from network); 15 Sep 2004 18:13:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Sep 2004 18:13:25 -0000 Received: (qmail 21272 invoked by uid 500); 15 Sep 2004 18:12:59 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 21074 invoked by uid 500); 15 Sep 2004 18:12:56 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 20945 invoked by uid 500); 15 Sep 2004 18:12:55 -0000 Received: (qmail 20913 invoked by uid 99); 15 Sep 2004 18:12:53 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,MULTI_REMOVAL_1WORD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Sep 2004 11:12:53 -0700 Received: (qmail 12243 invoked by uid 1513); 15 Sep 2004 18:12:51 -0000 Date: 15 Sep 2004 18:12:51 -0000 Message-ID: <20040915181251.12242.qmail@minotaur.apache.org> From: brj@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/util/collections RemovalAwareList.java RemovalAwareCollection.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N brj 2004/09/15 11:12:51 Modified: src/java/org/apache/ojb/broker/util/collections RemovalAwareList.java RemovalAwareCollection.java Log: fixed issue OJB285, patch by Carsten Ziegeler Revision Changes Path 1.5 +19 -1 db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareList.java Index: RemovalAwareList.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareList.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RemovalAwareList.java 30 Apr 2004 20:14:24 -0000 1.4 +++ RemovalAwareList.java 15 Sep 2004 18:12:51 -0000 1.5 @@ -92,6 +92,24 @@ } + protected void removeFromDeletion(Object toBeReadded) + { + if (allObjectsToBeRemoved.contains(toBeReadded)) + { + this.allObjectsToBeRemoved.remove(toBeReadded); + } + } + + /** + * @see java.util.Collection#add(Object) + */ + public boolean add(Object o) + { + boolean result = super.add(o); + removeFromDeletion(o); + return result; + } + /** * @see java.util.Vector#removeElementAt(int) */ 1.8 +19 -1 db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareCollection.java Index: RemovalAwareCollection.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareCollection.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RemovalAwareCollection.java 30 Apr 2004 20:14:24 -0000 1.7 +++ RemovalAwareCollection.java 15 Sep 2004 18:12:51 -0000 1.8 @@ -82,6 +82,24 @@ return result; } + protected void removeFromDeletion(Object toBeReadded) + { + if (allObjectsToBeRemoved.contains(toBeReadded)) + { + this.allObjectsToBeRemoved.remove(toBeReadded); + } + } + + /** + * @see java.util.Collection#add(Object) + */ + public boolean add(Object o) + { + boolean result = super.add(o); + removeFromDeletion(o); + return result; + } + /** * @see java.util.Vector#removeAllElements() */ --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org