Resources should be closed in reverse order. (#10532)

AlexeyKuznetsov-DD · web-flow · commit dffb2b0cf1a2 · 2026-02-06T20:56:00.000Z
Resources should be closed in reverse order.

Merge branch 'master' into alexeyk/attempt-to-fix-hanged-redisson-tests

Co-authored-by: alexey.kuznetsov &lt;alexey.kuznetsov@datadoghq.com&gt;
diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/test/groovy/RedissonClientTest.groovy
@@ -48,8 +48,8 @@ abstract class RedissonClientTest extends VersionedNamingTestBase {
   }
 
   def cleanupSpec() {
-    redissonClient.shutdown()
     lowLevelRedisClient.shutdown()
+    redissonClient.shutdown()
     redisServer.stop()
   }
 

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ abstract class RedissonClientTest extends VersionedNamingTestBase {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`def cleanupSpec() {`
`51`		`- redissonClient.shutdown()`
`52`	`51`	`lowLevelRedisClient.shutdown()`
	`52`	`+ redissonClient.shutdown()`
`53`	`53`	`redisServer.stop()`
`54`	`54`	`}`
`55`	`55`