From fc8a0184b0622b00e1521ab126c05de1350c13ba Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 30 Sep 2019 14:42:28 -0500 Subject: [PATCH] Polish Dispose default Scheduler --- ...actUserDetailsReactiveAuthenticationManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java index a38a9dafbc..83905db87f 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java @@ -56,8 +56,9 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement private ReactiveUserDetailsPasswordService userDetailsPasswordService; - Scheduler scheduler = Schedulers.newParallel("password-encoder"); - private boolean defaultScheduler = true; + private final Scheduler DEFAULT_SCHEDULER = Schedulers.newParallel("password-encoder"); + + private Scheduler scheduler = this.DEFAULT_SCHEDULER; private UserDetailsChecker preAuthenticationChecks = user -> { if (!user.isAccountNonLocked()) { @@ -140,10 +141,6 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement */ public void setScheduler(Scheduler scheduler) { Assert.notNull(scheduler, "scheduler cannot be null"); - if (this.defaultScheduler) { - this.defaultScheduler = false; - this.scheduler.dispose(); - } this.scheduler = scheduler; } @@ -179,8 +176,6 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement @Override public void destroy() { - if (this.defaultScheduler) { - this.scheduler.dispose(); - } + this.DEFAULT_SCHEDULER.dispose(); } }