From 2f455ed146ff2e56da4532e9430e4c85ca9497ad Mon Sep 17 00:00:00 2001
From: Peyang <peyang@peya.tokyo>
Date: Tue, 4 Nov 2025 16:08:15 +0000
Subject: [PATCH] 8371092: NullPointerException in
 AltServiceUsageTest.afterClass() test

Reviewed-by: dfuchs
---
 .../java/net/httpclient/AltServiceUsageTest.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/net/httpclient/AltServiceUsageTest.java b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
index 8b9193432f0..673357a59aa 100644
--- a/test/jdk/java/net/httpclient/AltServiceUsageTest.java
+++ b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
@@ -123,7 +123,7 @@ public class AltServiceUsageTest implements HttpServerAdapters {
     public void afterClass() throws Exception {
         safeStop(originServer);
         safeStop(altServer);
-        udpNotResponding.close();
+        safeClose(udpNotResponding);
     }
 
     private static void safeStop(final HttpTestServer server) {
@@ -140,6 +140,19 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         }
     }
 
+    private static void safeClose(final DatagramChannel channel) {
+        if (channel == null) {
+            return;
+        }
+        try {
+            System.out.println("Closing DatagramChannel " + channel.getLocalAddress());
+            channel.close();
+        } catch (Exception e) {
+            System.err.println("Ignoring exception: " + e.getMessage() + " that occurred " +
+                    "during close of DatagramChannel: " + channel);
+        }
+    }
+
     private static class H3AltServicePublisher implements HttpTestHandler {
         private static final String RESPONSE_CONTENT = "apple";