summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-11-19 13:41:47 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-11-19 13:41:47 -0500
commit520d792fb4a2382bdff526ea14e6cde149d745d4 (patch)
tree28b380c0e7ac49fd39859606e9098b165e528996
parent5f848b74793f679772473a3b5b2ab247bcc927a9 (diff)
parent37729e86a1389cd47266959bbe0a3e93ccaf3f51 (diff)
downloadchat-520d792fb4a2382bdff526ea14e6cde149d745d4.tar.gz
chat-520d792fb4a2382bdff526ea14e6cde149d745d4.tar.bz2
chat-520d792fb4a2382bdff526ea14e6cde149d745d4.zip
Merge pull request #1469 from 42wim/plt-1087
PLT-1087: return NewAppError instead of nil
-rw-r--r--model/utils.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/model/utils.go b/model/utils.go
index 6d6eb452d..ff26bfc66 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -53,7 +53,7 @@ func AppErrorFromJson(data io.Reader) *AppError {
if err == nil {
return &er
} else {
- return nil
+ return NewAppError("AppErrorFromJson", "could not decode", err.Error())
}
}