From 03e2de54cc26acba5e98970e63f192a43894eb9c Mon Sep 17 00:00:00 2001 From: SUMUKHA-PK Date: Sat, 16 Mar 2019 18:05:51 +0530 Subject: [PATCH] Build issues resolved --- .../dendrite/clientapi/routing/room_tagging.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/room_tagging.go b/src/github.com/matrix-org/dendrite/clientapi/routing/room_tagging.go index b0283126f..3356a2776 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/routing/room_tagging.go +++ b/src/github.com/matrix-org/dendrite/clientapi/routing/room_tagging.go @@ -85,8 +85,8 @@ func PutTag( } if len(data) > 0 { - dataByte, err := json.Marshal(data) - if err = json.Unmarshal(dataByte, &mtag); err != nil { + dataByte, _ := json.Marshal(data) + if err := json.Unmarshal(dataByte, &mtag); err != nil { return httputil.LogThenError(req, err) } } @@ -111,8 +111,8 @@ func DeleteTag( mtag := newMTag() if len(data) > 0 { - dataByte, err := json.Marshal(data) - if err = json.Unmarshal(dataByte, &mtag); err != nil { + dataByte, _ := json.Marshal(data) + if err := json.Unmarshal(dataByte, &mtag); err != nil { return httputil.LogThenError(req, err) } } else { @@ -164,7 +164,7 @@ func addDataToDB(req *http.Request, localpart string, roomID string, accountDB * if err := accountDB.SaveAccountData( req.Context(), localpart, roomID, "m.tag", string(newTagData), ); err != nil { - raiseError(req, err) + httputil.LogThenError(req, err) } }