diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-25 09:17:44 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-25 09:17:44 -0400 |
| commit | 219722e27a5832b33d2fad7cd5649015ea3523a8 (patch) | |
| tree | 41147ec35e9118bc2415bc41c4f9a9d433273bfd /src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java | |
| parent | bfc22d47158b685ff8c6a686faf0f213a65fa0e1 (diff) | |
| parent | ec7ed84b04cd3981ae01b104bd52fc010f31e6a7 (diff) | |
| download | gitblit-219722e27a5832b33d2fad7cd5649015ea3523a8.tar.gz gitblit-219722e27a5832b33d2fad7cd5649015ea3523a8.zip | |
Merge branch 'ticket/187' into develop
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java index 4c8d3a1d..a6aca22d 100644 --- a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -23,6 +23,7 @@ import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
import com.gitblit.GitBlitException;
@@ -99,8 +100,10 @@ public class ChangePasswordPage extends RootSubPage { try {
app().gitblit().reviseUser(user.username, user);
if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
+ WebRequest request = (WebRequest) getRequestCycle().getRequest();
WebResponse response = (WebResponse) getRequestCycle().getResponse();
- app().authentication().setCookie(response.getHttpServletResponse(), user);
+ app().authentication().setCookie(request.getHttpServletRequest(),
+ response.getHttpServletResponse(), user);
}
} catch (GitBlitException e) {
error(e.getMessage());
|