Invoke KCallablesJvm.setAccessible only when required

Closes-32536
sdeleuze · Mar 28, 2024 · 048e4f0 · 048e4f0
1 parent b28153e
commit 048e4f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -130,9 +130,11 @@ public static Publisher<?> invokeSuspendingFunction(
 									KType type = parameter.getType();
 									if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
 											&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
-										KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass);
-										KCallablesJvm.setAccessible(valueClassConstructor, true);
-										arg = valueClassConstructor.call(arg);
+										KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
+										if (!KCallablesJvm.isAccessible(constructor)) {
+											KCallablesJvm.setAccessible(constructor, true);
+										}
+										arg = constructor.call(arg);
 									}
 									argMap.put(parameter, arg);
 								}

diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -319,9 +319,11 @@ public static Object invokeFunction(Method method, Object target, Object[] args)
 							KType type = parameter.getType();
 							if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
 									&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
-								KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass);
-								KCallablesJvm.setAccessible(valueClassConstructor, true);
-								arg = valueClassConstructor.call(arg);
+								KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
+								if (!KCallablesJvm.isAccessible(constructor)) {
+									KCallablesJvm.setAccessible(constructor, true);
+								}
+								arg = constructor.call(arg);
 							}
 							argMap.put(parameter, arg);
 						}

diff --git a/.../src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/.../src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -330,9 +330,11 @@ public static Object invokeFunction(Method method, Object target, Object[] args,
 								KType type = parameter.getType();
 								if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
 										&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
-									KFunction<?> valueClassConstructor = KClasses.getPrimaryConstructor(kClass);
-									KCallablesJvm.setAccessible(valueClassConstructor, true);
-									arg = valueClassConstructor.call(arg);
+									KFunction<?> constructor = KClasses.getPrimaryConstructor(kClass);
+									if (!KCallablesJvm.isAccessible(constructor)) {
+										KCallablesJvm.setAccessible(constructor, true);
+									}
+									arg = constructor.call(arg);
 								}
 								argMap.put(parameter, arg);
 							}