jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
equal
deleted
inserted
replaced
46 import com.sun.xml.internal.bind.Util; |
46 import com.sun.xml.internal.bind.Util; |
47 import com.sun.xml.internal.bind.api.AccessorException; |
47 import com.sun.xml.internal.bind.api.AccessorException; |
48 import com.sun.xml.internal.bind.v2.ClassFactory; |
48 import com.sun.xml.internal.bind.v2.ClassFactory; |
49 import com.sun.xml.internal.bind.v2.WellKnownNamespace; |
49 import com.sun.xml.internal.bind.v2.WellKnownNamespace; |
50 import com.sun.xml.internal.bind.v2.model.core.ID; |
50 import com.sun.xml.internal.bind.v2.model.core.ID; |
51 import com.sun.xml.internal.bind.v2.model.nav.Navigator; |
|
52 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo; |
51 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo; |
53 import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo; |
52 import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo; |
54 import com.sun.xml.internal.bind.v2.runtime.property.AttributeProperty; |
53 import com.sun.xml.internal.bind.v2.runtime.property.AttributeProperty; |
55 import com.sun.xml.internal.bind.v2.runtime.property.Property; |
54 import com.sun.xml.internal.bind.v2.runtime.property.Property; |
56 import com.sun.xml.internal.bind.v2.runtime.property.PropertyFactory; |
55 import com.sun.xml.internal.bind.v2.runtime.property.PropertyFactory; |
345 if (!isThereAnOverridingProperty || bean.getClass().equals(jaxbType)) { |
344 if (!isThereAnOverridingProperty || bean.getClass().equals(jaxbType)) { |
346 p.serializeBody(bean, target, null); |
345 p.serializeBody(bean, target, null); |
347 } else if (isThereAnOverridingProperty) { |
346 } else if (isThereAnOverridingProperty) { |
348 // need to double check the override - it should be safe to do after the model has been created because it's targeted to override properties only |
347 // need to double check the override - it should be safe to do after the model has been created because it's targeted to override properties only |
349 Class beanClass = bean.getClass(); |
348 Class beanClass = bean.getClass(); |
350 if (Navigator.REFLECTION.getDeclaredField(beanClass, p.getFieldName()) == null) { |
349 if (Utils.REFLECTION_NAVIGATOR.getDeclaredField(beanClass, p.getFieldName()) == null) { |
351 p.serializeBody(bean, target, null); |
350 p.serializeBody(bean, target, null); |
352 } |
351 } |
353 } |
352 } |
354 } |
353 } |
355 } catch (AccessorException e) { |
354 } catch (AccessorException e) { |