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

Ensure JmxEndpoint beans get context object IDs

Browse Source 
Update `EndpointMBeanExporter` to ensure that `JmxEndpoint` as well
as regular `Endpoint` beans are considered when searching the parent
context.

Prior to this commit if the same `JmxEndpoint` was registered in the
both the child and parent context then the `context=` element of the
name wasn't added.

Fixes gh-8152
This commit is contained in:
Phillip Webb
2017-01-31 13:25:59 -08:00
parent 5dafa3ae9c
commit 21234b36de
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java
View File

@@ -283,13 +283,15 @@ public class EndpointMBeanExporter extends MBeanExporter
String beanKey) { String beanKey) {
if (applicationContext.getParent() != null) { if (applicationContext.getParent() != null) {
try { try {
this.applicationContext.getParent().getBean(beanKey, Endpoint.class); Object bean = this.applicationContext.getParent().getBean(beanKey);
return true; if (bean instanceof Endpoint || bean instanceof JmxEndpoint) {
return true;
}
} }
catch (BeansException ex) { catch (BeansException ex) {
return parentContextContainsSameBean(applicationContext.getParent(), // Ignore and continue
beanKey);
} }
return parentContextContainsSameBean(applicationContext.getParent(), beanKey);
} }
return false; return false;
} }