[jboss-svn-commits] JBoss Common SVN: r2134 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime

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

Author: alex.loubyansky at jboss.com
Date: 2006-10-18 16:30:48 -0400 (Wed, 18 Oct 2006)
New Revision: 2134

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java
Log:
minor: moved property metadata resolution into the block it is used in

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java	2006-10-17 11:22:54 UTC (rev 2133)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java	2006-10-18 20:30:48 UTC (rev 2134)
@@ -268,19 +268,6 @@
          }
          else
          {
-            PropertyMetaData propertyMetaData = wildcard == null ? null : wildcard.getPropertyMetaData();
-            if(propertyMetaData == null)
-            {
-               propertyMetaData = term.getPropertyMetaData();
-            }
-
-            /*
-            if(propertyMetaData == null)
-            {
-               propertyMetaData = element.getType().getPropertyMetaData();
-            }
-            */
-
             if(owner instanceof GenericValueContainer)
             {
                if(trace)
@@ -299,6 +286,12 @@
             }
             else
             {
+               PropertyMetaData propertyMetaData = wildcard == null ? null : wildcard.getPropertyMetaData();
+               if(propertyMetaData == null)
+               {
+                  propertyMetaData = term.getPropertyMetaData();
+               }
+
                String propName = null;
                String colType = null;
                if(propertyMetaData != null)