Fix for bug 916323 -

making sure that we delete all applications and re-verify before force-deleting a domain
openshift · Feb 27, 2013 · ed2a45b · ed2a45b
1 parent 17526d3
commit ed2a45b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/controller/app/controllers/domains_controller.rb b/controller/app/controllers/domains_controller.rb
@@ -149,10 +149,15 @@ def destroy
     end
 
     if force
-      domain.applications.each do |app|
-        app.destroy_app
+      apps = domain.with(consistency: :strong).applications
+      while apps.count > 0
+        apps.each do |app|
+          app.destroy_app
+        end
+        domain.with(consistency: :strong).reload
+        apps = domain.with(consistency: :strong).applications
       end
-    elsif not domain.applications.empty?
+    elsif not domain.with(consistency: :strong).applications.empty?
       return render_error(:bad_request, "Domain contains applications. Delete applications first or set force to true.", 128, "DELETE_DOMAIN")
     end