From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 5 Jul 2014 22:35:56 +0000 (+0200)
Subject: Fix redirection after successfull login.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=47c7d4c4c1ae05fb38b155283a6cd8b16972853b;ds=sidebyside

Fix redirection after successfull login.
---

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index acfc8f51..7febf2e5 100644
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -37,6 +37,7 @@ public class LoginPage extends Page {
 	@Override
 	public boolean beforeTemplate(HttpServletRequest req,
 			HttpServletResponse resp) throws IOException {
+		String redir = (String) req.getSession().getAttribute(LOGIN_RETURNPATH);
 		if (req.getSession().getAttribute("loggedin") == null) {
 			X509Certificate[] cert = (X509Certificate[]) req
 					.getAttribute("javax.servlet.request.X509Certificate");
@@ -49,7 +50,7 @@ public class LoginPage extends Page {
 		}
 
 		if (req.getSession().getAttribute("loggedin") != null) {
-			String s = (String) req.getSession().getAttribute(LOGIN_RETURNPATH);
+			String s = redir;
 			if (s != null) {
 				if (!s.startsWith("/")) {
 					s = "/" + s;