Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 42420 invoked from network); 14 Dec 2003 12:00:22 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 14 Dec 2003 12:00:22 -0000 Received: (qmail 26450 invoked by uid 500); 14 Dec 2003 12:00:21 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 26425 invoked by uid 500); 14 Dec 2003 12:00:20 -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 26412 invoked by uid 500); 14 Dec 2003 12:00:20 -0000 Received: (qmail 26409 invoked from network); 14 Dec 2003 12:00:20 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 14 Dec 2003 12:00:20 -0000 Received: (qmail 42397 invoked by uid 1520); 14 Dec 2003 12:00:21 -0000 Date: 14 Dec 2003 12:00:21 -0000 Message-ID: <20031214120021.42396.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/metadata CollectionDescriptor.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 2003/12/14 04:00:21 Modified: src/java/org/apache/ojb/broker/metadata CollectionDescriptor.java Log: Oops! Forgot to check for proxy the collection item class itself Revision Changes Path 1.24 +18 -9 db-ojb/src/java/org/apache/ojb/broker/metadata/CollectionDescriptor.java Index: CollectionDescriptor.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/CollectionDescriptor.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- CollectionDescriptor.java 13 Dec 2003 17:35:43 -0000 1.23 +++ CollectionDescriptor.java 14 Dec 2003 12:00:21 -0000 1.24 @@ -412,14 +412,23 @@ { DescriptorRepository repo = getClassDescriptor().getRepository(); ClassDescriptor cld = repo.getDescriptorFor(getItemClass()); - Collection extents = cld.getExtentClasses(); - m_hasProxyItems = Boolean.FALSE; - for (Iterator it = extents.iterator(); it.hasNext(); ) { - Class ext = (Class) it.next(); - ClassDescriptor cldExt = repo.getDescriptorFor(ext); - if (cldExt.getProxyClass() != null) { - m_hasProxyItems = Boolean.TRUE; - break; + if (cld.getProxyClass() != null) + { + m_hasProxyItems = Boolean.TRUE; + } + else + { + Collection extents = cld.getExtentClasses(); + m_hasProxyItems = Boolean.FALSE; + for (Iterator it = extents.iterator(); it.hasNext(); ) + { + Class ext = (Class) it.next(); + ClassDescriptor cldExt = repo.getDescriptorFor(ext); + if (cldExt.getProxyClass() != null) + { + m_hasProxyItems = Boolean.TRUE; + break; + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org