From d74f9e8b869ded3382df5340d21196eff7582311 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 9 Jan 2020 16:46:53 -0500 Subject: [PATCH] Fix new Sonar smell --- .../util/DynamicPeriodicTrigger.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java b/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java index ed5afe906b..bf7b84d65f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java @@ -35,18 +35,17 @@ import org.springframework.util.Assert; * * @author Gunnar Hillert * @author Gary Russell + * @author Artem Bilan * * @since 4.2 */ public class DynamicPeriodicTrigger implements Trigger { - private volatile Duration initialDuration = Duration.ofMillis(0); + private Duration initialDuration = Duration.ofMillis(0); - private volatile Duration duration; + private Duration duration; - private volatile TimeUnit timeUnit = TimeUnit.MILLISECONDS; - - private volatile boolean fixedRate = false; + private boolean fixedRate = false; /** * Create a trigger with the given period in milliseconds. The underlying @@ -177,14 +176,11 @@ public class DynamicPeriodicTrigger implements Trigger { return false; } if (this.initialDuration == null) { - if (other.initialDuration != null) { - return false; - } + return other.initialDuration == null; } - else if (!this.initialDuration.equals(other.initialDuration)) { - return false; + else { + return this.initialDuration.equals(other.initialDuration); } - return true; }