From d9cae339d60cc7f21b6f067fa4d66c5104cdc15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <sergei.tsypanov@yandex.ru>
Date: Fri, 13 Dec 2019 18:12:18 +0200
Subject: [PATCH] Simplify AdvisedSupport.removeAdvisor()

Closes gh-24205
---
 .../org/springframework/aop/framework/AdvisedSupport.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index a82e77a0f1b9..c654811c44a2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -283,16 +283,16 @@ public void removeAdvisor(int index) throws AopConfigException {
 					"This configuration only has " + this.advisors.size() + " advisors.");
 		}
 
-		Advisor advisor = this.advisors.get(index);
+		Advisor advisor = this.advisors.remove(index);
 		if (advisor instanceof IntroductionAdvisor) {
 			IntroductionAdvisor ia = (IntroductionAdvisor) advisor;
 			// We need to remove introduction interfaces.
-			for (int j = 0; j < ia.getInterfaces().length; j++) {
-				removeInterface(ia.getInterfaces()[j]);
+			Class<?>[] interfaces = ia.getInterfaces();
+			for (Class<?> iface : interfaces) {
+				removeInterface(iface);
 			}
 		}
 
-		this.advisors.remove(index);
 		updateAdvisorArray();
 		adviceChanged();
 	}