diff options
| author | Saša Živkov <zivkov@gmail.com> | 2015-05-06 13:00:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-06 13:00:24 +0000 |
| commit | bad310ec3f05644db07d6abbafb5291663ef0508 (patch) | |
| tree | 742750aac1c2c10295da07041aadfd8cb0067b67 | |
| parent | a82964fb7a53db13564ba42b18176026f7457354 (diff) | |
| parent | 8573bed76a959e2cf215de9ef7286b4ab48125e8 (diff) | |
Merge "OAuth: Check for session validity during logout" into stable-2.10
| -rw-r--r-- | gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java b/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java index 43b85bd29d..35253a1dfc 100644 --- a/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java +++ b/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java @@ -52,6 +52,8 @@ class OAuthLogoutServlet extends HttpLogoutServlet { protected void doLogout(HttpServletRequest req, HttpServletResponse rsp) throws IOException { super.doLogout(req, rsp); - oauthSession.get().logout(); + if (req.getSession(false) != null) { + oauthSession.get().logout(); + } } } |