root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

@EnableMBeanExport supports empty placeholders as well 

Issue: SPR-11105
This commit is contained in:
Juergen Hoeller 2013-11-26 14:43:10 +01:00
parent 119e793994
commit ef3a3b03ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
View File

@ -89,20 +89,20 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware,
private void setupDomain(AnnotationMBeanExporter exporter) { private void setupDomain(AnnotationMBeanExporter exporter) {
String defaultDomain = this.attributes.getString("defaultDomain"); String defaultDomain = this.attributes.getString("defaultDomain");
if (defaultDomain != null && this.environment != null) {
defaultDomain = this.environment.resolvePlaceholders(defaultDomain);
}
if (StringUtils.hasText(defaultDomain)) { if (StringUtils.hasText(defaultDomain)) {
if (this.environment != null) {
defaultDomain = this.environment.resolvePlaceholders(defaultDomain);
}
exporter.setDefaultDomain(defaultDomain); exporter.setDefaultDomain(defaultDomain);
} }
} }
private void setupServer(AnnotationMBeanExporter exporter) { private void setupServer(AnnotationMBeanExporter exporter) {
String server = this.attributes.getString("server"); String server = this.attributes.getString("server");
if (server != null && this.environment != null) {
server = this.environment.resolvePlaceholders(server);
}
if (StringUtils.hasText(server)) { if (StringUtils.hasText(server)) {
if (this.environment != null) {
server = this.environment.resolvePlaceholders(server);
}
exporter.setServer(this.beanFactory.getBean(server, MBeanServer.class)); exporter.setServer(this.beanFactory.getBean(server, MBeanServer.class));
} }
else { else {