Merge branch '6.1.x'

Author: jhoeller

spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java

@@ -280,7 +280,6 @@ else if (targetException instanceof Exception exception) {
 
 	/**
 	 * Invoke the given Kotlin coroutine suspended function.
-	 *
 	 * <p>The default implementation invokes
 	 * {@link CoroutinesUtils#invokeSuspendingFunction(Method, Object, Object...)},
 	 * but subclasses can override this method to use
@@ -292,6 +291,7 @@ protected Object invokeSuspendingFunction(Method method, Object target, Object[]
 		return CoroutinesUtils.invokeSuspendingFunction(method, target, args);
 	}
 
+
 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
 	 */
@@ -334,7 +334,6 @@ public static Object invokeFunction(Method method, Object target, Object[] args)
 			Object result = function.callBy(argMap);
 			return (result == Unit.INSTANCE ? null : result);
 		}
-
 	}
 
 }

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

@@ -313,6 +313,7 @@ private boolean isResponseHandled(Object[] args, ServerWebExchange exchange) {
 		return false;
 	}
 
+
 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
 	 */
@@ -371,7 +372,6 @@ public static Object invokeFunction(Method method, Object target, Object[] args,
 				return (result == Unit.INSTANCE ? null : result);
 			}
 		}
-
 	}
 
 }

spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -248,30 +248,31 @@ private void limitExceeded(String reason) {
 
 	@Override
 	public void close(CloseStatus status) throws IOException {
-		this.closeLock.lock();
-		try {
-			if (this.closeInProgress) {
-				return;
-			}
-			if (!CloseStatus.SESSION_NOT_RELIABLE.equals(status)) {
-				try {
-					checkSessionLimits();
-				}
-				catch (SessionLimitExceededException ex) {
-					// Ignore
+		if (this.closeLock.tryLock()) {
+			try {
+				if (this.closeInProgress) {
+					return;
 				}
-				if (this.limitExceeded) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Changing close status " + status + " to SESSION_NOT_RELIABLE.");
+				if (!CloseStatus.SESSION_NOT_RELIABLE.equals(status)) {
+					try {
+						checkSessionLimits();
+					}
+					catch (SessionLimitExceededException ex) {
+						// Ignore
+					}
+					if (this.limitExceeded) {
+						if (logger.isDebugEnabled()) {
+							logger.debug("Changing close status " + status + " to SESSION_NOT_RELIABLE.");
+						}
+						status = CloseStatus.SESSION_NOT_RELIABLE;
 					}
-					status = CloseStatus.SESSION_NOT_RELIABLE;
 				}
+				this.closeInProgress = true;
+				super.close(status);
+			}
+			finally {
+				this.closeLock.unlock();
 			}
-			this.closeInProgress = true;
-			super.close(status);
-		}
-		finally {
-			this.closeLock.unlock();
 		}
 	}