commit 70738bbd5859f86c988818ea60615df9275a5cda
author renjietang <renjietang@google.com> Wed Jul 08 15:07:12 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jul 08 15:07:42 2020 -0700
tree 829edad55b35c38d87698042070e13940ae382d1
parent 4581908bee97ea8a068fae818209ae3b0783fd64

Make QuicSession::OnStreamClosed() more robust.

Since we don't have the stream close loop anymore, closing stream twice is not expected.

No behavior change. not protected.

PiperOrigin-RevId: 320273993
Change-Id: I90c9162b41ef972eea5731eb74fe524d8f25fd5e

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index d83823b..e09decf 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -867,17 +867,17 @@
   QUIC_DVLOG(1) << ENDPOINT << "Closing stream: " << stream_id;
   StreamMap::iterator it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) {
-    QUIC_DVLOG(1) << ENDPOINT << "Stream is already closed: " << stream_id;
+    QUIC_BUG << ENDPOINT << "Stream is already closed: " << stream_id;
     return;
   }
   QuicStream* stream = it->second.get();
   StreamType type = stream->type();
 
   if (stream->IsWaitingForAcks()) {
-    zombie_streams_[stream->id()] = std::move(it->second);
+    zombie_streams_[stream_id] = std::move(it->second);
   } else {
     // Clean up the stream since it is no longer waiting for acks.
-    streams_waiting_for_acks_.erase(stream->id());
+    streams_waiting_for_acks_.erase(stream_id);
     closed_streams_.push_back(std::move(it->second));
     // Do not retransmit data of a closed stream.
     streams_with_pending_retransmission_.erase(stream_id);