#740 - ClassCastException: java.util.ArrayList cannot be cast to com.avaje.ebean.bean.BeanCollection at com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany.resetMany(BeanPropertyAssocMany.java:273)

src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -281,7 +281,7 @@ public class DefaultBeanLoader {
       }
     }
 
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(desc.getBeanType());
+    SpiQuery<?> query = server.createQuery(desc.getBeanType());
     query.setLazyLoadProperty(ebi.getLazyLoadProperty());
     if (draft) {
       query.asDraft();

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java

@@ -10,56 +10,69 @@ import javax.persistence.CascadeType;
  */
 public class BeanCascadeInfo {
 
-    /**
-     * should delete cascade.
-     */
-    boolean delete;
-    
-    /**
-     * Should save cascade.
-     */
-    boolean save;
+  private boolean delete;
 
-    public void setTypes(CascadeType[] types) {
-        for (int i = 0; i < types.length; i++) {
-            setType(types[i]);
-        }
+  private boolean save;
+
+  private boolean refresh;
+
+  public void setTypes(CascadeType[] types) {
+    for (int i = 0; i < types.length; i++) {
+      setType(types[i]);
     }
-    
-    private void setType(CascadeType type) {
-        if (type.equals(CascadeType.ALL)){
-            save = true;
-            delete = true;
-        }
-        if (type.equals(CascadeType.REMOVE)){
-            delete = true;
-        }
-        if (type.equals(CascadeType.PERSIST)){
-            save = true;
-        }
-        if (type.equals(CascadeType.MERGE)){
-            save = true;
-        }
-    }
-    
-    /**
-     * Return true if delete should cascade.
-     */
-    public boolean isDelete() {
-        return delete;
-    }
-    /**
-     * Set to true if delete should cascade.
-     */
-    public void setDelete(boolean delete) {
-        this.delete = delete;
-    }
-    /**
-     * Return true if save should cascade.
-     */
-    public boolean isSave() {
-        return save;
+  }
+
+  private void setType(CascadeType type) {
+    switch (type) {
+      case ALL:
+        save = true;
+        delete = true;
+        refresh = true;
+        break;
+      case REMOVE:
+        delete = true;
+        break;
+      case REFRESH:
+        refresh = true;
+        break;
+      case PERSIST:
+        save = true;
+        break;
+      case MERGE:
+        save = true;
+        break;
+      default:
+        throw new IllegalStateException("Unexpected CascadeType "+type);
     }
+  }
+
+  /**
+   * Return true if refresh should cascade.
+   */
+  public boolean isRefresh() {
+    return refresh;
+  }
+
+  /**
+   * Return true if delete should cascade.
+   */
+  public boolean isDelete() {
+    return delete;
+  }
+
+  /**
+   * Set to true if delete should cascade.
+   */
+  public void setDelete(boolean delete) {
+    this.delete = delete;
+  }
+
+  /**
+   * Return true if save should cascade.
+   */
+  public boolean isSave() {
+    return save;
+  }
 
   /**
    * Set cascade save and delete settings.

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -2089,7 +2089,9 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
 
     EntityBean bean = (EntityBean)dbBean;
     for (int i = 0; i < propertiesMany.length; i++) {
-      propertiesMany[i].resetMany(bean);
+      if (propertiesMany[i].isCascadeRefresh()) {
+        propertiesMany[i].resetMany(bean);
+      }
     }
   }
 

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java

@@ -168,7 +168,14 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
 	public BeanDescriptor<T> getTargetDescriptor() {
 		return targetDescriptor;
 	}
-	
+
+	/**
+	 * Return true if REFRESH should cascade.
+   */
+	public boolean isCascadeRefresh() {
+		return cascadeInfo.isRefresh();
+	}
+
 	public boolean isSaveRecurseSkippable(Object bean) {
 
     return saveRecurseSkippable && bean instanceof EntityBean && !((EntityBean) bean)._ebean_getIntercept().isNewOrDirty();

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -265,12 +265,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
    */
   public void resetMany(EntityBean bean) {
     Object value = getValue(bean);
-    if (value == null) {
-      // not expecting this - set an empty reference
-      createReference(bean);
-    } else {
+    if (value instanceof BeanCollection) {
       // reset the collection back to empty
       ((BeanCollection)value).reset(bean, name);
+    } else {
+      createReference(bean);
     }
   }