ApplicationListenerMethodAdapter uses target method for order lookup

jhoeller · jhoeller · commit 8c5cb77737c5 · 2019-02-07T23:48:31.000+01:00
Closes gh-22307
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -93,7 +93,7 @@ public ApplicationListenerMethodAdapter(String beanName, Class<?> targetClass, M
 
 		this.declaredEventTypes = resolveDeclaredEventTypes(method, ann);
 		this.condition = (ann != null ? ann.condition() : null);
-		this.order = resolveOrder(method);
+		this.order = resolveOrder(targetMethod);
 
 		this.methodKey = new AnnotatedElementKey(method, targetClass);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -93,7 +93,7 @@ public ApplicationListenerMethodAdapter(String beanName, Class<?> targetClass, M`
`93`	`93`
`94`	`94`	`this.declaredEventTypes = resolveDeclaredEventTypes(method, ann);`
`95`	`95`	`this.condition = (ann != null ? ann.condition() : null);`
`96`		`- this.order = resolveOrder(method);`
	`96`	`+ this.order = resolveOrder(targetMethod);`
`97`	`97`
`98`	`98`	`this.methodKey = new AnnotatedElementKey(method, targetClass);`
`99`	`99`	`}`