diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index a6802a3c2..2d94052d7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -115,28 +115,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { private final Map namedQuery; - public void merge(EntityBean bean, EntityBean existing) { - - EntityBeanIntercept fromEbi = bean._ebean_getIntercept(); - EntityBeanIntercept toEbi = existing._ebean_getIntercept(); - - int propertyLength = toEbi.getPropertyLength(); - String[] names = getProperties(); - - for (int i = 0; i < propertyLength; i++) { - - if (fromEbi.isLoadedProperty(i)) { - BeanProperty property = getBeanProperty(names[i]); - if (!toEbi.isLoadedProperty(i)) { - Object val = property.getValue(bean); - property.setValue(existing, val); - } else if (property.isMany()) { - property.merge(bean, existing); - } - } - } - } - public enum EntityType { ORM, EMBEDDED, VIEW, SQL, DOC } @@ -756,6 +734,28 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { } } + public void merge(EntityBean bean, EntityBean existing) { + + EntityBeanIntercept fromEbi = bean._ebean_getIntercept(); + EntityBeanIntercept toEbi = existing._ebean_getIntercept(); + + int propertyLength = toEbi.getPropertyLength(); + String[] names = getProperties(); + + for (int i = 0; i < propertyLength; i++) { + + if (fromEbi.isLoadedProperty(i)) { + BeanProperty property = getBeanProperty(names[i]); + if (!toEbi.isLoadedProperty(i)) { + Object val = property.getValue(bean); + property.setValue(existing, val); + } else if (property.isMany()) { + property.merge(bean, existing); + } + } + } + } + /** * Return the ReadAuditLogger for logging read audit events. */