This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 382e6e369cb01d7e0db6ebeb9baa7de13e942d5a Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Jun 25 07:25:24 2026 +0100 Fixup --- .../apache/cxf/rs/security/oauth2/services/AbstractTokenService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java index e170f5e7a24..f657e527af2 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java @@ -141,13 +141,8 @@ public class AbstractTokenService extends AbstractOAuthService { if (clientSecretVerifier != null) { return clientSecretVerifier.validateClientSecret(client, providedClientSecret); } -<<<<<<< HEAD - return client.getClientSecret() != null && providedClientSecret != null - && MessageDigest.isEqual(client.getClientSecret().getBytes(StandardCharsets.UTF_8), -======= return client.getClientSecret() != null && providedClientSecret != null && MessageDigest.isEqual(client.getClientSecret().getBytes(StandardCharsets.UTF_8), ->>>>>>> 2dadd0d5af (Wire the STSClient through to URIResolver (#3106)) providedClientSecret.getBytes(StandardCharsets.UTF_8)); } protected boolean isValidPublicClient(Client client, String clientId) {
