From 26577575666412b10063ee52acdf954a099c28f4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 5 Nov 2020 13:10:45 +0100
Subject: [PATCH] Separate assignment statements for local variable and
 instance field

See gh-25899
---
 .../aop/aspectj/MethodInvocationProceedingJoinPoint.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
index 58cb7ba28d..d25ec2eb6b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -223,7 +223,8 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		public String[] getParameterNames() {
 			String[] parameterNames = this.parameterNames;
 			if (parameterNames == null) {
-				this.parameterNames = parameterNames = parameterNameDiscoverer.getParameterNames(getMethod());
+				parameterNames = parameterNameDiscoverer.getParameterNames(getMethod());
+				this.parameterNames = parameterNames;
 			}
 			return parameterNames;
 		}