[BZ 1206084] Delete all the BundleDestinations before removing Resour…

…ceGroup
rhq-project · Oct 14, 2015 · a7fc733 · a7fc733
1 parent aa79ebd
commit a7fc733
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/.../jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/.../jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
@@ -59,6 +59,7 @@
 import org.rhq.core.domain.auth.Subject;
 import org.rhq.core.domain.authz.Permission;
 import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.bundle.BundleDestination;
 import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
 import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
 import org.rhq.core.domain.criteria.GroupOperationHistoryCriteria;
@@ -88,6 +89,7 @@
 import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
 import org.rhq.enterprise.server.authz.PermissionException;
 import org.rhq.enterprise.server.authz.RequiredPermission;
+import org.rhq.enterprise.server.bundle.BundleManagerLocal;
 import org.rhq.enterprise.server.operation.OperationManagerLocal;
 import org.rhq.enterprise.server.resource.ResourceManagerLocal;
 import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
@@ -109,6 +111,8 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
     @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
     private EntityManager entityManager;
 
+    @EJB
+    private BundleManagerLocal bundleManager;
     @EJB
     //@IgnoreDependency
     private OperationManagerLocal operationManager;
@@ -314,6 +318,15 @@ public void deleteResourceGroup(Subject subject, int groupId) throws ResourceGro
         q.setParameter("groupId", group.getId());
         q.executeUpdate();
 
+        // Delete all the bundleDestinations to avoid FK issues
+        for (BundleDestination bundleDestination : group.getBundleDestinations()) {
+            try {
+                bundleManager.deleteBundleDestination(subject, bundleDestination.getId());
+            } catch (Exception e) {
+                throw new RuntimeException("Could not delete bundle destination " + bundleDestination.toString(), e);
+            }
+        }
+
         entityManager.remove(group);
     }