[jboss-svn-commits] JBoss Common SVN: r2575 - jbossxb/trunk/src/main/java/org/jboss/xb/builder.

[jboss-svn-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-09-24 23:21:01 -0400 (Mon, 24 Sep 2007)
New Revision: 2575

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
Log:
Only use the collection parameter type if it was not previously overriden.

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-09-24 16:59:42 UTC (rev 2574)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-09-25 03:21:01 UTC (rev 2575)
@@ -1407,8 +1407,8 @@
 
                      // TODO yes, this is another hack with collections
                      JBossXmlChild xmlChild = ((ClassInfo) propertyType).getUnderlyingAnnotation(JBossXmlChild.class);
-                     if (xmlChild == null)
-                     {
+                     if (xmlChild == null && localPropertyType.equals(propertyType))
+                     { // the localPropertyType was not overriden previously so use the collection parameter type
                         localPropertyType = typeArg;
                      }
                   }