Skip to content

Commit

Permalink
fixing a bad merge (#1994)
Browse files Browse the repository at this point in the history
#1969 and https://github.com/envoyproxy/envoy-mobile/pull/1965/files didn't merge conflict but test-conflicted.
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
  • Loading branch information
alyssawilk authored Jan 4, 2022
1 parent 8736d56 commit 4481078
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion library/common/http/client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ void Client::DirectStreamCallbacks::encodeHeaders(const ResponseHeaderMap& heade

absl::string_view alpn = "";
uint64_t response_status = Utility::getResponseStatus(headers);
if (direct_stream_.request_decoder_->streamInfo().upstreamInfo() &&
if (direct_stream_.request_decoder_ &&
direct_stream_.request_decoder_->streamInfo().upstreamInfo() &&
direct_stream_.request_decoder_->streamInfo().upstreamInfo()->upstreamSslConnection()) {
alpn = direct_stream_.request_decoder_->streamInfo()
.upstreamInfo()
Expand Down

0 comments on commit 4481078

Please sign in to comment.