Ensure the thread variables are reset when exiting the block

Shopify · Jun 11, 2024 · 6faac3f · 6faac3f
1 parent 4a07e6a
commit 6faac3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/identity_cache.rb b/lib/identity_cache.rb
@@ -203,6 +203,9 @@ def with_deferred_parent_expiration
 
  Thread.current[:deferred_parent_expiration] = nil
  Thread.current[:parent_records_for_cache_expiry].each(&:expire_primary_index)
+ ensure
+ Thread.current[:deferred_parent_expiration] = nil
+ Thread.current[:parent_records_for_cache_expiry].clear
  end
 
  def with_fetch_read_only_records(value = true)

diff --git a/test/index_cache_test.rb b/test/index_cache_test.rb
@@ -191,8 +191,6 @@ def test_with_deferred_parent_expiration
  assert_operator(@memcached_spy.calls.count, :>, 0)
  assert_equal(expected_item_expiration_count, item_expiration_count)
  assert_equal(expected_associated_record_expiration_count, associated_record_expiration_count)
- ensure
- Thread.current[:deferred_parent_expiration] = nil
  end
 
  def test_double_nested_deferred_parent_expiration
@@ -215,8 +213,6 @@ def test_double_nested_deferred_parent_expiration
  end
 
  assert_equal(0, @memcached_spy.calls.count)
- ensure
- Thread.current[:deferred_parent_expiration] = nil
  end
 
  def test_deep_association_with_deferred_parent_expiration
@@ -254,8 +250,6 @@ def test_deep_association_with_deferred_parent_expiration
  assert_equal(expected_item_expiration_count, item_expiration_count)
  assert_equal(expected_associated_record_expiration_count, associated_record_expiration_count)
  assert_equal(expected_deeply_associated_record_expiration_count, deeply_associated_record_expiration_count)
- ensure
- Thread.current[:deferred_parent_expiration] = nil
  end
 
  private