From 14ec1e3278e8211ccbca5d48eb5e650adb793af6 Mon Sep 17 00:00:00 2001 From: Jack Shirazi Date: Thu, 29 Jul 2021 15:49:03 +0100 Subject: [PATCH] ensure that the socket is closed even if there is an exception from the other close --- .../agent/vertx/helper/CommonVertxServerClientTest.java | 7 +++++-- .../agent/vertx/webclient/AbstractVertxWebClientTest.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/CommonVertxServerClientTest.java b/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/CommonVertxServerClientTest.java index ac1522df41..0e70ad1689 100644 --- a/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/CommonVertxServerClientTest.java +++ b/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/helper/CommonVertxServerClientTest.java @@ -101,8 +101,11 @@ public void setUpClient() { @AfterEach public void close() { - client.close(); - close(vertx); + try { + client.close(); + } finally { + close(vertx); + } } @Override diff --git a/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/webclient/AbstractVertxWebClientTest.java b/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/webclient/AbstractVertxWebClientTest.java index 7e3b251d28..d7c580cc6d 100644 --- a/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/webclient/AbstractVertxWebClientTest.java +++ b/apm-agent-plugins/apm-vertx/apm-vertx-common/src/test/java/co/elastic/apm/agent/vertx/webclient/AbstractVertxWebClientTest.java @@ -59,8 +59,11 @@ public void setUp() { @After public void tearDown() { - close(vertx); - client.close(); + try { + close(vertx); + } finally { + client.close(); + } } @Override