Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Invoke KCallablesJvm.setAccessible only when required

Browse Source 
Closes-32536
This commit is contained in:
Sébastien Deleuze
2024-03-28 11:12:50 +01:00
parent b28153e1d7
commit 048e4f0aa2
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
View File

@@ -130,9 +130,11 @@ public abstract class CoroutinesUtils {
KType type = parameter.getType(); KType type = parameter.getType();
if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) { && KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass); KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
KCallablesJvm.setAccessible(valueClassConstructor, true); if (!KCallablesJvm.isAccessible(constructor)) {
arg = valueClassConstructor.call(arg); KCallablesJvm.setAccessible(constructor, true);
}
arg = constructor.call(arg);
} }
argMap.put(parameter, arg); argMap.put(parameter, arg);
} }

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

@@ -319,9 +319,11 @@ public class InvocableHandlerMethod extends HandlerMethod {
KType type = parameter.getType(); KType type = parameter.getType();
if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) { && KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass); KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
KCallablesJvm.setAccessible(valueClassConstructor, true); if (!KCallablesJvm.isAccessible(constructor)) {
arg = valueClassConstructor.call(arg); KCallablesJvm.setAccessible(constructor, true);
}
arg = constructor.call(arg);
} }
argMap.put(parameter, arg); argMap.put(parameter, arg);
} }

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

@@ -330,9 +330,11 @@ public class InvocableHandlerMethod extends HandlerMethod {
KType type = parameter.getType(); KType type = parameter.getType();
if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) { && KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass); KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
KCallablesJvm.setAccessible(valueClassConstructor, true); if (!KCallablesJvm.isAccessible(constructor)) {
arg = valueClassConstructor.call(arg); KCallablesJvm.setAccessible(constructor, true);
}
arg = constructor.call(arg);
} }
argMap.put(parameter, arg); argMap.put(parameter, arg);
} }