Handle categories not used

openshift · Sep 17, 2013 · a256f66 · a256f66
1 parent 76c72f6
commit a256f66
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/controller/app/models/application.rb b/controller/app/models/application.rb
@@ -2672,7 +2672,11 @@ def calculate_configure_order(comp_specs)
 
     # enforce system order of components (web_framework first etc)
     system_order = []
-    ['web_framework','service','plugin'].each { |c| categories[c].each { |ci| system_order << ci if ci and not system_order.include?(ci) } }
+    ['web_framework','service','plugin'].each { |c|
+      if categories[c]
+        categories[c].each { |ci| system_order << ci if ci and not system_order.include?(ci) }
+      end
+    }
     configure_order.add_component_order(system_order)
 
     #calculate configure order using tsort
@@ -2728,7 +2732,11 @@ def calculate_component_orders
 
     # enforce system order of components (web_framework first etc)
     system_order = []
-    ['web_framework','service','plugin'].each { |c| categories[c].each { |ci| system_order << ci if ci and not system_order.include?(ci) } }
+    ['web_framework','service','plugin'].each { |c|
+      if categories[c]
+        categories[c].each { |ci| system_order << ci if ci and not system_order.include?(ci) }
+      end
+    }
     start_order.add_component_order(system_order)
     stop_order.add_component_order(system_order.dup)