Skip to content

Commit 675d40b

Browse files
ukaiadg
authored andcommitted
go.net/websocket: fix error check in Send
Fixes golang/go#3727 R=golang-dev, adg CC=golang-dev https://golang.org/cl/6306080
1 parent 8a5603b commit 675d40b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

websocket/websocket.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ type Codec struct {
285285

286286
// Send sends v marshaled by cd.Marshal as single frame to ws.
287287
func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
288-
if err != nil {
289-
return err
290-
}
291288
data, payloadType, err := cd.Marshal(v)
292289
if err != nil {
293290
return err
294291
}
295292
ws.wio.Lock()
296293
defer ws.wio.Unlock()
297294
w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
295+
if err != nil {
296+
return err
297+
}
298298
_, err = w.Write(data)
299299
w.Close()
300300
return err

0 commit comments

Comments
 (0)