You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ol...@apache.org on 2004/01/14 01:09:32 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer CollectionProxy.java
olegnitz 2004/01/13 16:09:32
Modified: src/java/org/apache/ojb/broker/accesslayer
CollectionProxy.java
Log:
Changed point for calling listeners to avoid possibility of infinite recursion
Revision Changes Path
1.25 +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.25
diff -u -r1.24 -r1.25
--- CollectionProxy.java 28 Oct 2003 21:21:19 -0000 1.24
+++ CollectionProxy.java 14 Jan 2004 00:09:32 -0000 1.25
@@ -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