commit bad310ec3f05644db07d6abbafb5291663ef0508
author Saša Živkov <zivkov@gmail.com> Wed May 06 13:00:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 06 13:00:24 2015 +0000
tree 742750aac1c2c10295da07041aadfd8cb0067b67
parent a82964fb7a53db13564ba42b18176026f7457354
parent 8573bed76a959e2cf215de9ef7286b4ab48125e8

Merge "OAuth: Check for session validity during logout" into stable-2.10

gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java

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 43b85bd..35253a1 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 @@
   protected void doLogout(HttpServletRequest req, HttpServletResponse rsp)
       throws IOException {
     super.doLogout(req, rsp);
-    oauthSession.get().logout();
+    if (req.getSession(false) != null) {
+      oauthSession.get().logout();
+    }
   }
 }