From 7b6b91aae79b2ae3b566c6250dced41c91bf0ae9 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 3 Aug 2018 08:35:45 +0900 Subject: [PATCH] Return null immediately when sla is null in convertSla() Closes gh-13991 --- .../autoconfigure/metrics/PropertiesMeterFilter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java index fee3568ed5cb..63f5477ec38d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java @@ -39,8 +39,6 @@ */ public class PropertiesMeterFilter implements MeterFilter { - private static final ServiceLevelAgreementBoundary[] EMPTY_SLA = {}; - private MetricsProperties properties; public PropertiesMeterFilter(MetricsProperties properties) { @@ -67,7 +65,10 @@ public DistributionStatisticConfig configure(Meter.Id id, } private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) { - long[] converted = Arrays.stream((sla != null) ? sla : EMPTY_SLA) + if (sla == null) { + return null; + } + long[] converted = Arrays.stream(sla) .map((candidate) -> candidate.getValue(meterType)) .filter(Objects::nonNull).mapToLong(Long::longValue).toArray(); return (converted.length != 0) ? converted : null;