From 410812c5bc07a46a11cf5fed66abe13f4df583e7 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 12 Feb 2026 17:08:19 -0700
Subject: [PATCH] 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>
---
 .../crypto/password/AbstractValidatingPasswordEncoder.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java
index 22db6fcc84..700bd47de7 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/AbstractValidatingPasswordEncoder.java
@@ -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);