Skip to content

Commit e7686b4

Browse files
authored
Merge pull request #5 from bubble-diff/dev
fix nil pointer
2 parents ce186d7 + 1beab90 commit e7686b4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

stream.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func handleHttp(c2s, s2c io.Reader) {
8181
c2sReader := bufio.NewReader(c2s)
8282
s2cReader := bufio.NewReader(s2c)
8383
for {
84+
// read http request and response.
8485
req, err := http.ReadRequest(c2sReader)
8586
if err == io.EOF || err == io.ErrUnexpectedEOF {
8687
break
@@ -96,6 +97,7 @@ func handleHttp(c2s, s2c io.Reader) {
9697
continue
9798
}
9899

100+
// send http req/resp to bubblereplay.
99101
err = sendReqResp(req, resp)
100102
if err != nil {
101103
logrus.Errorf("send old req/resp failed, %s", err)
@@ -137,7 +139,6 @@ func sendReqResp(req *http.Request, resp *http.Response) (err error) {
137139

138140
api := fmt.Sprintf("http://%s%s", configuration.ReplaySvrAddr, ApiAddRecord)
139141
apiResp, err := http.Post(api, "application/octet-stream", bytes.NewReader(rawpb))
140-
defer apiResp.Body.Close()
141142
if err != nil {
142143
return err
143144
}
@@ -155,5 +156,5 @@ func sendReqResp(req *http.Request, resp *http.Response) (err error) {
155156
return errors.New(response.Msg)
156157
}
157158

158-
return nil
159+
return apiResp.Body.Close()
159160
}

0 commit comments

Comments
 (0)