From 4a6eb954743f5b84aad6a4739e90a3946d556313 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Wed, 11 Sep 2013 03:53:50 +0900
Subject: [PATCH] Fix redirect path to the context root.

---
 src/main/scala/app/SignInController.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala
index 67a837877..8e246629e 100644
--- a/src/main/scala/app/SignInController.scala
+++ b/src/main/scala/app/SignInController.scala
@@ -42,12 +42,12 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
     session.setAttribute("LOGIN_ACCOUNT", account)
     updateLastLoginDate(account.userName)
 
-    session.get("REDIRECT").map { redirectUrl =>
+    session.get("REDIRECT").map { case redirectUrl: String =>
       session.removeAttribute("REDIRECT")
-      if(redirectUrl == request.getContextPath + "/"){
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
         redirect("/")
       } else {
-        redirect(redirectUrl.asInstanceOf[String])
+        redirect(redirectUrl)
       }
     }.getOrElse {
       redirect("/")