Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 52347 invoked from network); 14 Jan 2004 00:11:29 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 14 Jan 2004 00:11:29 -0000 Received: (qmail 60740 invoked by uid 500); 14 Jan 2004 00:11:13 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 60710 invoked by uid 500); 14 Jan 2004 00:11:13 -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 60687 invoked by uid 500); 14 Jan 2004 00:11:13 -0000 Received: (qmail 60680 invoked from network); 14 Jan 2004 00:11:13 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 14 Jan 2004 00:11:13 -0000 Received: (qmail 52325 invoked by uid 1520); 14 Jan 2004 00:11:27 -0000 Date: 14 Jan 2004 00:11:27 -0000 Message-ID: <20040114001127.52324.qmail@minotaur.apache.org> From: olegnitz@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer CollectionProxy.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N olegnitz 2004/01/13 16:11:26 Modified: src/java/org/apache/ojb/broker/accesslayer Tag: OJB_BRANCH_1_0 CollectionProxy.java Log: Changed point for calling listeners to avoid possibility of infinite recursion Revision Changes Path No revision No revision 1.24.2.1 +3 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionProxy.java Index: CollectionProxy.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionProxy.java,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- CollectionProxy.java 28 Oct 2003 21:21:19 -0000 1.24 +++ CollectionProxy.java 14 Jan 2004 00:11:26 -0000 1.24.2.1 @@ -139,7 +139,6 @@ try { Collection result; - beforeLoading(); if (m_data != null) // could be set by listener { result = m_data; @@ -152,7 +151,6 @@ { result = (Collection) getCollectionClass().newInstance(); } - afterLoading(); return result; } catch (Exception ex) @@ -399,7 +397,9 @@ { if (!isLoaded()) { + beforeLoading(); setData(loadData()); + afterLoading(); } return m_data; --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org