[jboss-svn-commits] JBoss Common SVN: r2062 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/marshalling

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

Author: alex.loubyansky at jboss.com
Date: 2006-09-25 11:18:16 -0400 (Mon, 25 Sep 2006)
New Revision: 2062

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/marshalling/MarshallerImpl.java
Log:
marshalling part of JBXB-85

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/marshalling/MarshallerImpl.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/marshalling/MarshallerImpl.java	2006-09-25 14:55:56 UTC (rev 2061)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/marshalling/MarshallerImpl.java	2006-09-25 15:18:16 UTC (rev 2062)
@@ -355,7 +355,12 @@
       String elementNs = elementQName.getNamespaceURI();
       String elementLocal = elementQName.getLocalPart();
 
-      XOPMarshaller xopMarshaller = type.getXopMarshaller();
+      XOPMarshaller xopMarshaller = schema.getXopMarshaller();
+      if(xopMarshaller == null)
+      {
+         xopMarshaller = type.getXopMarshaller();
+      }
+      
       if(xopMarshaller != null && isXopOptimizable(type))
       {
          String cid = null;