simplify onStreamCompleted in the receiveStream

quic-go · Nov 9, 2019 · 529e14d · 529e14d
1 parent dc66c8a
commit 529e14d
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/receive_stream.go b/receive_stream.go
@@ -84,7 +84,7 @@ func (s *receiveStream) Read(p []byte) (int, error) {
 	s.mutex.Unlock()
 
 	if completed {
-		s.streamCompleted()
+		s.sender.onStreamCompleted(s.streamID)
 	}
 	return n, err
 }
@@ -201,7 +201,8 @@ func (s *receiveStream) CancelRead(errorCode protocol.ApplicationErrorCode) {
 	s.mutex.Unlock()
 
 	if completed {
-		s.streamCompleted()
+		s.flowController.Abandon()
+		s.sender.onStreamCompleted(s.streamID)
 	}
 }
 
@@ -226,7 +227,8 @@ func (s *receiveStream) handleStreamFrame(frame *wire.StreamFrame) error {
 	s.mutex.Unlock()
 
 	if completed {
-		s.streamCompleted()
+		s.flowController.Abandon()
+		s.sender.onStreamCompleted(s.streamID)
 	}
 	return err
 }
@@ -257,7 +259,8 @@ func (s *receiveStream) handleResetStreamFrame(frame *wire.ResetStreamFrame) err
 	s.mutex.Unlock()
 
 	if completed {
-		s.streamCompleted()
+		s.flowController.Abandon()
+		s.sender.onStreamCompleted(s.streamID)
 	}
 	return err
 }
@@ -312,17 +315,6 @@ func (s *receiveStream) getWindowUpdate() protocol.ByteCount {
 	return s.flowController.GetWindowUpdate()
 }
 
-func (s *receiveStream) streamCompleted() {
-	s.mutex.Lock()
-	finRead := s.finRead
-	s.mutex.Unlock()
-
-	if !finRead {
-		s.flowController.Abandon()
-	}
-	s.sender.onStreamCompleted(s.streamID)
-}
-
 // signalRead performs a non-blocking send on the readChan
 func (s *receiveStream) signalRead() {
 	select {