service/dap: fix compile error from merge conflict (#2818)

Co-authored-by: Polina Sokolova <polinasok@users.noreply.github.com>
go-delve · Dec 8, 2021 · 2f13672 · 2f13672
1 parent a4ac69e
commit 2f13672
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
@@ -867,7 +867,7 @@ func TestRemoteDAPClientAfterContinue(t *testing.T) {
 	c.ContinueRequest(1)
 	c.ExpectContinueResponse(t)
 	c.DisconnectRequest()
-	c.ExpectOutputEventClosingClient(t)
+	c.ExpectOutputEventClosingClient(t, "running")
 	c.ExpectDisconnectResponse(t)
 	c.ExpectTerminatedEvent(t)
 	c.Close()

diff --git a/service/dap/server.go b/service/dap/server.go
@@ -499,7 +499,7 @@ func (s *Session) address() string {
 	if s.config.Listener != nil {
 		return s.config.Listener.Addr().String()
 	}
-	if netconn, ok := s.conn.(net.Conn); ok {
+	if netconn, ok := s.conn.ReadWriteCloser.(net.Conn); ok {
 		return netconn.LocalAddr().String()
 	}
 	return ""