From bcec0c87482dd3fff59b293a64ec694bb42ebcbb Mon Sep 17 00:00:00 2001
From: generatedunixname28243149908649644 <noreply+28243149908649644@fb.com>
Date: Fri, 25 Sep 2026 16:45:11 -0700
Subject: [PATCH] facebook-conditional-operator-argument-copy in
 HTTPCoroConnector.cpp

Reviewed By: jbeshay

Differential Revision: D120675433

fbshipit-source-id: 10c62c6c180f3823c5a027c4de91dc1c24e4ad43
---
 proxygen/lib/http/coro/client/HTTPCoroConnector.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/proxygen/lib/http/coro/client/HTTPCoroConnector.cpp b/proxygen/lib/http/coro/client/HTTPCoroConnector.cpp
index 129b93a68..ebabde739 100644
--- a/proxygen/lib/http/coro/client/HTTPCoroConnector.cpp
+++ b/proxygen/lib/http/coro/client/HTTPCoroConnector.cpp
@@ -240,9 +240,15 @@ folly::coro::Task<std::unique_ptr<CoroTransportIf>> connectFizz(
     wangle::TransportInfo& tinfo) {
   ConnectCB cb;
   AsyncFizzClient::UniquePtr fizzClient;
-  auto pskIdentity = connParams.fizzPskIdentity.value_or(
-      connParams.serverName.empty() ? connectAddr.getAddressStr()
-                                    : connParams.serverName);
+  const std::string pskIdentity = [&]() -> std::string {
+    if (connParams.fizzPskIdentity) {
+      return *connParams.fizzPskIdentity;
+    }
+    if (connParams.serverName.empty()) {
+      return connectAddr.getAddressStr();
+    }
+    return connParams.serverName;
+  }();
 
   std::optional<ExpectedIdentity> expectedIdentity;
   folly::Optional<std::string> sendSNI;