root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Juergen Hoeller 2024-04-23 16:07:46 +02:00
parent a77895bd90 580adfcbed
commit 3991cae875
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,6 @@ public class InvocableHandlerMethod extends HandlerMethod {
/**
* 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 @@ public class InvocableHandlerMethod extends HandlerMethod {
return CoroutinesUtils.invokeSuspendingFunction(method, target, args);
}
/**
* Inner class to avoid a hard dependency on Kotlin at runtime.
*/
@ -334,7 +334,6 @@ public class InvocableHandlerMethod extends HandlerMethod {
Object result = function.callBy(argMap);
return (result == Unit.INSTANCE ? null : result);
}
}
}

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

@ -313,6 +313,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
return false;
}
/**
* Inner class to avoid a hard dependency on Kotlin at runtime.
*/
@ -371,7 +372,6 @@ public class InvocableHandlerMethod extends HandlerMethod {
return (result == Unit.INSTANCE ? null : result);
}
}
}
}

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

@ -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 @@ public class ConcurrentWebSocketSessionDecorator extends WebSocketSessionDecorat
@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();
if (this.closeLock.tryLock()) {
try {
if (this.closeInProgress) {
return;
}
catch (SessionLimitExceededException ex) {
// Ignore
}
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();
}
}