Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 5 insertions, 14 deletions

diff --git a/model/cluster_message.go b/model/cluster_message.go
index 9cf0e4d55..cf9e3f9f2 100644
--- a/model/cluster_message.go
+++ b/model/cluster_message.go
@@ -36,21 +36,12 @@ type ClusterMessage struct {
 }
 
 func (o *ClusterMessage) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func ClusterMessageFromJson(data io.Reader) *ClusterMessage {
-	decoder := json.NewDecoder(data)
-	var o ClusterMessage
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *ClusterMessage
+	json.NewDecoder(data).Decode(&o)
+	return o
 }