From b38fcee62cda17797dc1528f6b973908a18dab0b Mon Sep 17 00:00:00 2001
From: Kartik Khare <kharekartik@gmail.com>
Date: Wed, 14 Feb 2024 11:44:42 +0530
Subject: [PATCH] Bug fix: Do not ignore scheme property (#12332)

Co-authored-by: Kartik Khare <kharekartik@kartiks-macbook-pro.tail8a064.ts.net>
---
 .../client/JsonAsyncHttpPinotClientTransportFactory.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
index 6f4e39059960..3471796d2846 100644
--- a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
+++ b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
@@ -85,8 +85,9 @@ public JsonAsyncHttpPinotClientTransportFactory withConnectionProperties(Propert
       _headers = ConnectionUtils.getHeadersFromProperties(properties);
     }
 
-    if (_scheme == null) {
-      _scheme = properties.getProperty("scheme", CommonConstants.HTTP_PROTOCOL);
+    String scheme = properties.getProperty("scheme", CommonConstants.HTTP_PROTOCOL);
+    if (_scheme == null || !_scheme.contentEquals(scheme)) {
+      _scheme = scheme;
     }
 
     if (_sslContext == null && _scheme.contentEquals(CommonConstants.HTTPS_PROTOCOL)) {