Browse Source

Reduce Diff Size

This commit reorders the originally changed boolean logic so that it returns
false early, as it did before. This allows the change to remain small and also
keeps the most complex logical statements outside of the if statement.

Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
pull/18754/head
Josh Cummings 1 month ago
parent
commit
410812c5bc
  1. 6
      crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java

6
crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java

@ -44,10 +44,10 @@ public abstract class AbstractValidatingPasswordEncoder implements PasswordEncod @@ -44,10 +44,10 @@ public abstract class AbstractValidatingPasswordEncoder implements PasswordEncod
@Override
public final boolean matches(@Nullable CharSequence rawPassword, @Nullable String encodedPassword) {
if (StringUtils.hasLength(rawPassword) && StringUtils.hasLength(encodedPassword)) {
return matchesNonNull(rawPassword.toString(), encodedPassword);
if (!StringUtils.hasLength(rawPassword) || !StringUtils.hasLength(encodedPassword)) {
return false;
}
return false;
return matchesNonNull(rawPassword.toString(), encodedPassword);
}
protected abstract boolean matchesNonNull(String rawPassword, String encodedPassword);

Loading…
Cancel
Save