diff options
| author | James Moger <james.moger@gitblit.com> | 2014-02-03 11:13:47 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-02-03 11:13:47 -0500 |
| commit | 0ff4df2ac9fbbadde296a3ac7f79095416b60745 (patch) | |
| tree | 796c7a986d93d81f3bd67e03d09a97978facd1e0 | |
| parent | 1219104d67774dd23b0dc64df596533336042c08 (diff) | |
| download | gitblit-0ff4df2ac9fbbadde296a3ac7f79095416b60745.tar.gz gitblit-0ff4df2ac9fbbadde296a3ac7f79095416b60745.zip | |
Fix NPE in cookie change detection on login
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/SessionPage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/SessionPage.java b/src/main/java/com/gitblit/wicket/pages/SessionPage.java index 22ae6e2e..8065c5aa 100644 --- a/src/main/java/com/gitblit/wicket/pages/SessionPage.java +++ b/src/main/java/com/gitblit/wicket/pages/SessionPage.java @@ -57,7 +57,7 @@ public abstract class SessionPage extends WebPage { UserModel user = app().users().getUserModel(session.getUser().username);
// validate cookie during session (issue-361)
- if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, true)) {
+ if (user != null && app().settings().getBoolean(Keys.web.allowCookieAuthentication, true)) {
HttpServletRequest request = ((WebRequest) getRequestCycle().getRequest())
.getHttpServletRequest();
String requestCookie = app().authentication().getCookie(request);
|