diff options
Diffstat (limited to 'model/license.go')
-rw-r--r-- | model/license.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/model/license.go b/model/license.go index a81f882ca..f96cba06c 100644 --- a/model/license.go +++ b/model/license.go @@ -169,23 +169,14 @@ func (l *License) IsStarted() bool { } func (l *License) ToJson() string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func LicenseFromJson(data io.Reader) *License { - decoder := json.NewDecoder(data) - var o License - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *License + json.NewDecoder(data).Decode(&o) + return o } func (lr *LicenseRecord) IsValid() *AppError { |