diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 20e9a9aaa93..43edf53f8eb 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,8 +139,8 @@ class ExchangeImpl {
     private boolean isUpgradeRequest(Headers headers) {
         var values = headers.get("Connection");
         return values != null
-            && headers.get("Upgrade") != null
-            && GET.equals(getRequestMethod())
+            && GET.equals(method)
+            && headers.containsKey("Upgrade")
             && values.stream().filter("Upgrade"::equalsIgnoreCase).findAny().isPresent();
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeInputStream.java
index 2822935912a..fd72ace09de 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeInputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeOutputStream.java
index c30d2ff6628..918c46f6035 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UpgradeOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it