From 7067461d711f9b830386761494fa0fdee02a025d Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Wed, 12 Jan 2022 15:04:05 +0000 Subject: [PATCH] Fix exception in Jetty10RequestUpgradeStrategy Closes gh-27899 --- .../socket/server/upgrade/Jetty10RequestUpgradeStrategy.java | 4 ++-- .../socket/server/jetty/Jetty10RequestUpgradeStrategy.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java index cf5ab94581..4629c96980 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,7 +149,7 @@ public class Jetty10RequestUpgradeStrategy implements RequestUpgradeStrategy { public Object invoke(@NonNull MethodInvocation invocation) { if (this.protocol != null) { ReflectionUtils.invokeMethod( - setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol); + setAcceptedSubProtocol, invocation.getArguments()[1], this.protocol); } return this.adapter; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java index 1ba1756547..0391bbf5f9 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -158,7 +158,7 @@ public class Jetty10RequestUpgradeStrategy implements RequestUpgradeStrategy { public Object invoke(@NonNull MethodInvocation invocation) { if (this.protocol != null) { ReflectionUtils.invokeMethod( - setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol); + setAcceptedSubProtocol, invocation.getArguments()[1], this.protocol); } return this.adapter; }