summaryrefslogtreecommitdiffstats
path: root/app/session.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-04-24 12:40:17 -0400
committerGitHub <noreply@github.com>2017-04-24 12:40:17 -0400
commit134f78e630589531df212d3cb2bb748aa9bf68f4 (patch)
tree06b41c20546c1f83a08b2a5306dbc504b9a7e24d /app/session.go
parent3b7dc2c477e0f7ba08cbf1b6dc847cc6b453045b (diff)
downloadchat-134f78e630589531df212d3cb2bb748aa9bf68f4.tar.gz
chat-134f78e630589531df212d3cb2bb748aa9bf68f4.tar.bz2
chat-134f78e630589531df212d3cb2bb748aa9bf68f4.zip
Fxing hub panic (#6214)
Diffstat (limited to 'app/session.go')
-rw-r--r--app/session.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/session.go b/app/session.go
index 0df643743..273ab2dd5 100644
--- a/app/session.go
+++ b/app/session.go
@@ -4,10 +4,11 @@
package app
import (
+ "net/http"
+
"github.com/mattermost/platform/einterfaces"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
- "net/http"
l4g "github.com/alecthomas/log4go"
)
@@ -47,7 +48,7 @@ func GetSession(token string) (*model.Session, *model.AppError) {
} else {
session = sessionResult.Data.(*model.Session)
- if session.IsExpired() || session.Token != token {
+ if session == nil || session.IsExpired() || session.Token != token {
return nil, model.NewLocAppError("GetSession", "api.context.invalid_token.error", map[string]interface{}{"Token": token, "Error": sessionResult.Err.DetailedError}, "")
} else {
AddSessionToCache(session)