JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/SteveAppContext.java‎
Lines changed: 19 additions & 10 deletions b/‎src/main/java/de/rwth/idsg/steve/SteveAppContext.java‎
Lines changed: 19 additions & 10 deletions
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
 
 import static de.rwth.idsg.steve.SteveConfiguration.CONFIG;
@@ -112,24 +113,32 @@ private Handler getRedirectHandler() {
         rewrite.setRewriteRequestURI(true);
         rewrite.setRewritePathInfo(true);
 
-        String root = CONFIG.getContextPath();
-
-        String[] redirectArray = {
-                "",
-//                root + "",
-//                root + "/",
-        };
-
-        for (String redirect : redirectArray) {
+        for (String redirect : getRedirectSet()) {
             RedirectPatternRule rule = new RedirectPatternRule();
             rule.setTerminating(true);
             rule.setPattern(redirect);
-            rule.setLocation(root + "/manager/home");
+            rule.setLocation(CONFIG.getContextPath() + "/manager/home");
             rewrite.addRule(rule);
         }
         return rewrite;
     }
 
+    private HashSet<String> getRedirectSet() {
+        String path = CONFIG.getContextPath();
+
+        HashSet<String> redirectSet = new HashSet<>(3);
+        redirectSet.add("");
+        redirectSet.add(path + "");
+
+        // Otherwise (if path = ""), we would already be at root of the server ("/")
+        // and using the redirection below would cause an infinite loop.
+        if (!"".equals(path)) {
+            redirectSet.add(path + "/");
+        }
+
+        return redirectSet;
+    }
+
     // -------------------------------------------------------------------------
     // JSP stuff
     //