brj 2005/12/05 11:59:20
Modified: src/java/org/apache/ojb/broker/accesslayer/sql Tag:
OJB_1_0_RELEASE SqlQueryStatement.java
Log:
improved handling of superclasses in pathclass hints
Revision Changes Path
No revision
No revision
1.75.2.21 +9 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
Index: SqlQueryStatement.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
retrieving revision 1.75.2.20
retrieving revision 1.75.2.21
diff -u -r1.75.2.20 -r1.75.2.21
--- SqlQueryStatement.java 4 Dec 2005 09:09:20 -0000 1.75.2.20
+++ SqlQueryStatement.java 5 Dec 2005 19:59:20 -0000 1.75.2.21
@@ -1433,9 +1433,9 @@
}
/**
+ * Answer the ClassDescriptor for itemClass for an
ObjectReferenceDescriptor
+ * check optional hint. The returned Class is to highest superclass
contained in the hint list.
* TODO: add super ClassDescriptor
- * answer the ClassDescriptor for itemClass for an
ObjectReferenceDescriptor
- * check optional hint;
*/
private ClassDescriptor getItemClassDescriptor(ObjectReferenceDescriptor
ord, List hintClasses)
{
@@ -1452,7 +1452,12 @@
{
Class clazz = (Class) iter.next();
Class superClazz = clazz.getSuperclass();
-
+
+ if (superClazz != null &&
resultClass.equals(superClazz.getSuperclass()))
+ {
+ continue; // skip if we already have a super superclass
+ }
+
if (hintClasses.contains(superClazz))
{
resultClass = superClazz; // use superclass if it's in the
hints
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
