AS7-6132 Modernise the cascadeDelete method with generics to remove the

downcast problem
schakko · Dec 11, 2012 · eafe7ee · eafe7ee
1 parent 63b79f5
commit eafe7ee
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/cmp/src/main/java/org/jboss/as/cmp/jdbc2/bridge/JDBCCMRFieldBridge2.java b/cmp/src/main/java/org/jboss/as/cmp/jdbc2/bridge/JDBCCMRFieldBridge2.java
@@ -660,12 +660,9 @@ public void setValue(CmpEntityBeanContext ctx, Object value) {
         }
 
         public void cascadeDelete(CmpEntityBeanContext ctx) throws RemoveException {
-            Collection value = (Collection) getValue(ctx);
-            if (!value.isEmpty()) {
-                EJBLocalObject[] locals = (EJBLocalObject[]) value.toArray();
-                for (int i = 0; i < locals.length; ++i) {
-                    locals[i].remove();
-                }
+            Collection<EJBLocalObject> cmrs = (Collection<EJBLocalObject>) getValue(ctx);
+            for (EJBLocalObject localEjb : cmrs) {
+                localEjb.remove();
             }
         }
 
@@ -1118,8 +1115,7 @@ private interface CMRFieldLoader {
         void addRelatedId(CmpEntityBeanContext ctx, Object relatedId);
     }
 
-    private class CMRSet
-            implements Set {
+    private class CMRSet implements Set {
         private final CmpEntityBeanContext ctx;
         private final CollectionValuedFieldState state;