7105350: HttpExchange's attributes are the same as HttpContext's attributes

src/java.base/share/classes/module-info.java

@@ -278,7 +278,8 @@
         jdk.net;
     exports sun.net to
         java.net.http,
-        jdk.naming.dns;
+        jdk.naming.dns,
+        jdk.httpserver;
     exports sun.net.ext to
         jdk.net;
     exports sun.net.dns to

src/java.base/share/conf/net.properties

@@ -129,6 +129,13 @@ jdk.http.auth.tunneling.disabledSchemes=Basic
 #
 jdk.http.ntlm.transparentAuth=disabled
 
+# Prior to JDK 26, the HttpExchange attribute map was shared with the enclosing HttpContext.
+# Since JDK 26, by default, exchange attributes are per-exchange and the context attributes must
+# be accessed by calling getHttpContext().getAttributes(). Uncomment this property to
+# restore the pre JDK 26 behavior.
+#
+# jdk.httpserver.attributes=context
+
 #
 # Maximum HTTP field section size that a client is prepared to accept
 #

src/jdk.httpserver/share/classes/module-info.java

@@ -101,6 +101,8 @@
  * socket option on all incoming connections.
  * </li></ul>
  *
+ * Additional system/networking properties may be defined in net.properties
+ *
  * @apiNote The API and SPI in this module are designed and implemented to support a minimal
  * HTTP server and simple HTTP semantics primarily.
  *

src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java

@@ -29,6 +29,7 @@
 import java.net.*;
 import javax.net.ssl.*;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.text.*;
@@ -38,6 +39,8 @@
 import java.util.stream.Stream;
 import com.sun.net.httpserver.*;
 
+import sun.net.NetProperties;
+
 class ExchangeImpl {
 
     Headers reqHdrs, rspHdrs;
@@ -59,6 +62,9 @@ class ExchangeImpl {
 
     /* for formatting the Date: header */
     private static final DateTimeFormatter FORMATTER;
+    private static final boolean perExchangeAttributes =
+        !Optional.ofNullable(NetProperties.get("jdk.httpserver.attributes")).orElse("")
+              .equals("context");
     static {
         String pattern = "EEE, dd MMM yyyy HH:mm:ss zzz";
         FORMATTER = DateTimeFormatter.ofPattern(pattern, Locale.US)
@@ -76,7 +82,7 @@ class ExchangeImpl {
     PlaceholderOutputStream uos_orig;
 
     boolean sentHeaders; /* true after response headers sent */
-    Map<String,Object> attributes;
+    final Map<String,Object> attributes;
     int rcode = -1;
     HttpPrincipal principal;
     ServerImpl server;
@@ -91,6 +97,9 @@ class ExchangeImpl {
         this.uri = u;
         this.connection = connection;
         this.reqContentLen = len;
+        this.attributes = perExchangeAttributes
+            ? new ConcurrentHashMap<>()
+            : getHttpContext().getAttributes();
         /* ros only used for headers, body written directly to stream */
         this.ros = req.outputStream();
         this.ris = req.inputStream();
@@ -361,26 +370,15 @@ public SSLSession getSSLSession () {
     }
 
     public Object getAttribute (String name) {
-        if (name == null) {
-            throw new NullPointerException ("null name parameter");
-        }
-        if (attributes == null) {
-            attributes = getHttpContext().getAttributes();
-        }
-        return attributes.get (name);
+        return attributes.get(Objects.requireNonNull(name, "null name parameter"));
     }
 
     public void setAttribute (String name, Object value) {
-        if (name == null) {
-            throw new NullPointerException ("null name parameter");
-        }
-        if (attributes == null) {
-            attributes = getHttpContext().getAttributes();
-        }
+        var key = Objects.requireNonNull(name, "null name parameter");
         if (value != null) {
-            attributes.put (name, value);
+            attributes.put(key, value);
         } else {
-            attributes.remove (name);
+            attributes.remove(key);
         }
     }
 

test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java

@@ -71,7 +71,7 @@ public static void setup() {
     public void testExchangeAttributes() throws Exception {
         var handler = new AttribHandler();
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR,0), 10);
-        server.createContext("/", handler);
+        server.createContext("/", handler).getAttributes().put("attr", "context-val");
         server.start();
         try {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
@@ -101,6 +101,7 @@ static class AttribHandler implements HttpHandler {
         @java.lang.Override
         public void handle(HttpExchange exchange) throws IOException {
             try {
+                assertNull(exchange.getAttribute("attr"));
                 exchange.setAttribute("attr", "val");
                 assertEquals("val", exchange.getAttribute("attr"));
                 exchange.setAttribute("attr", null);