src/java.httpclient/share/classes/java/net/http/Http1Exchange.java

*** 62,97 ****
          this.executor = client.executorWrapper();
          this.operations = Collections.synchronizedList(new LinkedList<>());
          if (connection != null) {
              this.connection = connection;
          } else {
!             InetSocketAddress addr = getAddress(request);
              this.connection = HttpConnection.getConnection(addr, request);
          }
          this.requestAction = new Http1Request(request, this.connection);
      }
  
-     private static InetSocketAddress getAddress(HttpRequestImpl req) {
-         URI uri = req.uri();
-         if (uri == null) {
-             return req.authority();
-         }
-         int port = uri.getPort();
-         if (port == -1) {
-             if (uri.getScheme().equalsIgnoreCase("https")) {
-                 port = 443;
-             } else {
-                 port = 80;
-             }
-         }
-         String host = uri.getHost();
-         if (req.proxy() == null) {
-             return new InetSocketAddress(host, port);
-         } else {
-             return InetSocketAddress.createUnresolved(host, port);
-         }
-     }
  
      HttpConnection connection() {
          return connection;
      }
  
--- 62,77 ----
          this.executor = client.executorWrapper();
          this.operations = Collections.synchronizedList(new LinkedList<>());
          if (connection != null) {
              this.connection = connection;
          } else {
!             InetSocketAddress addr = Utils.getAddress(request);
              this.connection = HttpConnection.getConnection(addr, request);
          }
          this.requestAction = new Http1Request(request, this.connection);
      }
  
  
      HttpConnection connection() {
          return connection;
      }
  
*** 209,219 ****
                              } catch (Throwable e) {
                                  cf.completeExceptionally(e);
                                  connection.close();
                              }
                           },
!                          () -> request.getAccessControlContext());
          operations.add(cf);
          return cf;
      }
  
      /**
--- 189,199 ----
                              } catch (Throwable e) {
                                  cf.completeExceptionally(e);
                                  connection.close();
                              }
                           },
!                 request::getAccessControlContext);
          operations.add(cf);
          return cf;
      }
  
      /**
*** 267,277 ****
                  cf.complete(null);
              } catch (Throwable e) {
                  cf.completeExceptionally(e);
                  connection.close();
              }
!         }, () -> request.getAccessControlContext());
          operations.add(cf);
          return cf;
      }
  
      @Override
--- 247,257 ----
                  cf.complete(null);
              } catch (Throwable e) {
                  cf.completeExceptionally(e);
                  connection.close();
              }
!         }, request::getAccessControlContext);
          operations.add(cf);
          return cf;
      }
  
      @Override
*** 300,309 ****
                  cf.complete(null);
              } catch (Throwable e) {
                  cf.completeExceptionally(e);
                  connection.close();
              }
!         }, () -> request.getAccessControlContext());
          operations.add(cf);
          return cf;
      }
  }
--- 280,289 ----
                  cf.complete(null);
              } catch (Throwable e) {
                  cf.completeExceptionally(e);
                  connection.close();
              }
!         }, request::getAccessControlContext);
          operations.add(cf);
          return cf;
      }
  }