From a6ca305f211e655623aec7537fbb1e8c63f0492c Mon Sep 17 00:00:00 2001
From: rangao <gaoran_10@126.com>
Date: Fri, 8 Dec 2023 09:36:34 +0800
Subject: [PATCH] fix

---
 .../java/org/apache/pulsar/broker/service/ServerCnx.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 4f90ee9397b47..6d84e22f162a1 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -658,6 +658,10 @@ private void doAuthentication(AuthData clientData,
             if (state != State.Connected) {
                 // First time authentication is done
                 if (service.isAuthenticationEnabled()) {
+                    if (!useOriginalAuthState) {
+                        this.authRole = newAuthRole;
+                        this.authenticationData = newAuthDataSource;
+                    }
                     if (service.isAuthorizationEnabled()) {
                         if (!service.getAuthorizationService()
                                 .isValidOriginalPrincipal(this.authRole, originalPrincipal, remoteAddress, false)) {
@@ -669,10 +673,6 @@ private void doAuthentication(AuthData clientData,
                             return;
                         }
                     }
-                    if (!useOriginalAuthState) {
-                        this.authRole = newAuthRole;
-                        this.authenticationData = newAuthDataSource;
-                    }
                     maybeScheduleAuthenticationCredentialsRefresh();
                 }
                 completeConnect(clientProtocolVersion, clientVersion);