Merge pull request #932 from dhoard/issue-924

Added try/finally to close the HttpExchange
prometheus · Mar 21, 2024 · 7998f12 · 7998f12
2 parents 8bb7544 + d84b0fa
commit 7998f12
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...er-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java b/...er-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java
@@ -58,10 +58,13 @@ public DefaultHandler() {
 
     @Override
     public void handle(HttpExchange exchange) throws IOException {
-        exchange.getResponseHeaders().set("Content-Type", contentType);
-        exchange.getResponseHeaders().set("Content-Length", Integer.toString(responseBytes.length));
-        exchange.sendResponseHeaders(200, responseBytes.length);
-        exchange.getResponseBody().write(responseBytes);
-        exchange.close();
+        try {
+            exchange.getResponseHeaders().set("Content-Type", contentType);
+            exchange.getResponseHeaders().set("Content-Length", Integer.toString(responseBytes.length));
+            exchange.sendResponseHeaders(200, responseBytes.length);
+            exchange.getResponseBody().write(responseBytes);
+        } finally {
+            exchange.close();
+        }
     }
 }
diff --git a/...er-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java b/...er-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java
@@ -22,10 +22,13 @@ public HealthyHandler() {
 
     @Override
     public void handle(HttpExchange exchange) throws IOException {
-        exchange.getResponseHeaders().set("Content-Type", contentType);
-        exchange.getResponseHeaders().set("Content-Length", Integer.toString(responseBytes.length));
-        exchange.sendResponseHeaders(200, responseBytes.length);
-        exchange.getResponseBody().write(responseBytes);
-        exchange.close();
+        try {
+            exchange.getResponseHeaders().set("Content-Type", contentType);
+            exchange.getResponseHeaders().set("Content-Length", Integer.toString(responseBytes.length));
+            exchange.sendResponseHeaders(200, responseBytes.length);
+            exchange.getResponseBody().write(responseBytes);
+        } finally {
+            exchange.close();
+        }
     }
 }