Merge pull request #16922 from jerryk55/fix_swift_refresher_with_empt…

…y_containers Make sure Containers Exist Before Processing (cherry picked from commit 530eb07) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542741
ManageIQ · Feb 6, 2018 · 478b32a · 478b32a
1 parent c36d654
commit 478b32a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/models/manageiq/providers/storage_manager/swift_manager/refresh_parser.rb b/app/models/manageiq/providers/storage_manager/swift_manager/refresh_parser.rb
@@ -123,8 +123,8 @@ def safe_list(&block)
     end
 
     def cleanup
-      @data[:cloud_object_store_containers].each { |c| c.delete(:tenant_id) }
-      @data[:cloud_object_store_objects].each    { |c| c.delete(:tenant_id) }
+      @data[:cloud_object_store_containers]&.each { |c| c.delete(:tenant_id) }
+      @data[:cloud_object_store_objects]&.each    { |c| c.delete(:tenant_id) }
     end
   end
 end
diff --git a/...anageiq/providers/storage_manager/swift_manager/refresh_parser/cross_linkers/openstack.rb b/...anageiq/providers/storage_manager/swift_manager/refresh_parser/cross_linkers/openstack.rb
@@ -11,11 +11,11 @@ def initialize(parent_ems, data)
     end
 
     def cross_link
-      @data[:cloud_object_store_containers].each do |container_hash|
+      @data[:cloud_object_store_containers]&.each do |container_hash|
         link_to_tenant(container_hash)
       end
 
-      @data[:cloud_object_store_objects].each do |object_hash|
+      @data[:cloud_object_store_objects]&.each do |object_hash|
         link_to_tenant(object_hash)
       end
     end