opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Bump JGit version to 3.7.1.201504261725-r
  Hybrid OpenID/OAuth: Check for session validity during logout
  RestApiServlet: Leave OutputStream open when flushing base64 padding
  RestApiServlet: Flush pending padding as well

Change-Id: Ic26b95ca86f6429969d2608be77ce31af10761d2
This commit is contained in:
David Pursehouse 2015-04-28 14:11:05 +09:00
commit e0216d7cec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java
View File

@ -50,6 +50,8 @@ class OAuthOverOpenIDLogoutServlet extends HttpLogoutServlet {
protected void doLogout(HttpServletRequest req, HttpServletResponse rsp) protected void doLogout(HttpServletRequest req, HttpServletResponse rsp)
throws IOException { throws IOException {
super.doLogout(req, rsp); super.doLogout(req, rsp);
oauthSession.get().logout(); if (req.getSession(false) != null) {
oauthSession.get().logout();
}
} }
} }