From 922c5dc8dd1e8372dd8953cfc89daf49faeea199 Mon Sep 17 00:00:00 2001
From: David <3dgiordano@gmail.com>
Date: Sat, 18 Jul 2026 12:32:48 -0300
Subject: [PATCH] In case of exception restore the original setting.

---
 .../http2/core/HTTP2JettyClientTest.java       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/test/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClientTest.java b/src/test/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClientTest.java
index 8142961..6b515b9 100644
--- a/src/test/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClientTest.java
+++ b/src/test/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClientTest.java
@@ -1003,11 +1003,13 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithCode() throws Exception
     sampler.setImageParser(true);
     String message = "message";
     String responseCode = "300";
+    String previousCacheMode = JMeterUtils.getProperty("cache_manager.cached_resource_mode");
     JMeterUtils.setProperty("cache_manager.cached_resource_mode", "RETURN_CUSTOM_STATUS");
     JMeterUtils.setProperty("RETURN_CUSTOM_STATUS.message", message);
     JMeterUtils.setProperty("RETURN_CUSTOM_STATUS.code", responseCode);
     JmeterCachedResourceModeSupport.refreshSnapshotFromProperties();
     configureCacheManagerToSampler(true, false);
+    try {
     HTTPSampleResult firstRequestExpected = buildResult(true, Code.OK,
       hostHeader(), null, null, createURL(SERVER_PATH_200_EMBEDDED), HTTPConstants.GET);
     firstRequestExpected.setResponseData(BASIC_HTML_TEMPLATE, StandardCharsets.UTF_8.name());
@@ -1020,6 +1022,9 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithCode() throws Exception
     firstRequestExpected.setSentBytes(0);
     firstRequestExpected.setResponseData("", StandardCharsets.UTF_8.name());
     validateEmbeddedResultCached(sampleWithGet(SERVER_PATH_200_EMBEDDED), firstRequestExpected);
+    } finally {
+      restoreCacheResourceMode(previousCacheMode);
+    }
   }
 
   /**
@@ -1035,10 +1040,12 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithoutCode() throws Except
     buildStartedServer();
     sampler.setImageParser(true);
     String message = "message";
+    String previousCacheMode = JMeterUtils.getProperty("cache_manager.cached_resource_mode");
     JMeterUtils.setProperty("cache_manager.cached_resource_mode", "RETURN_200_CACHE");
     JMeterUtils.setProperty("RETURN_200_CACHE.message", message);
     JmeterCachedResourceModeSupport.refreshSnapshotFromProperties();
     configureCacheManagerToSampler(true, false);
+    try {
     // First request must connect to the server
     HTTPSampleResult expected = buildResult(true, Code.OK,
       hostHeader(), null, null, createURL(SERVER_PATH_200_EMBEDDED), HTTPConstants.GET);
@@ -1050,6 +1057,17 @@ public void shouldNotGetSubResultWhenResourceIsCachedWithoutCode() throws Except
     expected.setResponseData("", StandardCharsets.UTF_8.name());
     expected.setResponseMessage(message);
     validateEmbeddedResultCached(sampleWithGet(SERVER_PATH_200_EMBEDDED), expected);
+    } finally {
+      restoreCacheResourceMode(previousCacheMode);
+    }
+  }
+
+  private void restoreCacheResourceMode(String previousCacheMode) {
+    if (previousCacheMode == null) {
+      JMeterUtils.getJMeterProperties().remove("cache_manager.cached_resource_mode");
+    } else {
+      JMeterUtils.setProperty("cache_manager.cached_resource_mode", previousCacheMode);
+    }
   }
 
   @Test