Handle possible null management overrides

spring-projects · Dec 29, 2019 · 4ab7c39 · 4ab7c39
1 parent 57d4584
commit 4ab7c39
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java b/...src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java
@@ -54,6 +54,7 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Meherzad Lahewala
+ * @author Jonathan Pearlin
  *
  * @since 4.2
  *
@@ -278,7 +279,7 @@ public void afterSingletonsInstantiated() {
 				.getBeansOfType(IntegrationManagement.class);
 		for (Entry<String, IntegrationManagement> entry : managed.entrySet()) {
 			IntegrationManagement bean = entry.getValue();
-			if (!bean.getOverrides().loggingConfigured) {
+			if (!getOverrides(bean).loggingConfigured) {
 				bean.setLoggingEnabled(this.defaultLoggingEnabled);
 			}
 			String name = entry.getKey();
@@ -292,7 +293,7 @@ private void injectCaptor() {
 				.getBeansOfType(IntegrationManagement.class);
 		for (Entry<String, IntegrationManagement> entry : managed.entrySet()) {
 			IntegrationManagement bean = entry.getValue();
-			if (!bean.getOverrides().loggingConfigured) {
+			if (!getOverrides(bean).loggingConfigured) {
 				bean.setLoggingEnabled(this.defaultLoggingEnabled);
 			}
 			bean.registerMetricsCaptor(this.metricsCaptor);
@@ -364,7 +365,7 @@ private void configureChannelMetrics(String name,
 			metrics = this.metricsFactory.createChannelMetrics(name);
 		}
 		Assert.state(metrics != null, "'metrics' must not be null");
-		ManagementOverrides overrides = bean.getOverrides();
+		ManagementOverrides overrides = getOverrides(bean);
 		Boolean enabled = PatternMatchUtils.smartMatch(name, this.enabledCountsPatterns);
 		if (enabled != null) {
 			bean.setCountsEnabled(enabled);
@@ -396,7 +397,7 @@ private void configureHandlerMetrics(String name,
 			org.springframework.integration.support.management.MessageHandlerMetrics bean) {
 		AbstractMessageHandlerMetrics metrics = this.metricsFactory.createHandlerMetrics(name);
 		Assert.state(metrics != null, "'metrics' must not be null");
-		ManagementOverrides overrides = bean.getOverrides();
+		ManagementOverrides overrides = getOverrides(bean);
 		Boolean enabled = PatternMatchUtils.smartMatch(name, this.enabledCountsPatterns);
 		if (enabled != null) {
 			bean.setCountsEnabled(enabled);
@@ -432,7 +433,7 @@ private void configureSourceMetrics(String name,
 			bean.setCountsEnabled(enabled);
 		}
 		else {
-			if (!bean.getOverrides().countsConfigured) {
+			if (!getOverrides(bean).countsConfigured) {
 				bean.setCountsEnabled(this.defaultCountsEnabled);
 			}
 		}
@@ -506,4 +507,8 @@ public org.springframework.integration.support.management.MessageSourceMetrics g
 		return null;
 	}
 
+	private static ManagementOverrides getOverrides(IntegrationManagement bean) {
+		return bean.getOverrides() != null ? bean.getOverrides() : new ManagementOverrides();
+	}
+
 }