Code cleanup

Be sure to send actionURL even if no other query params

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2573 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java b/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
index 6794210..ccc04fe 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
@@ -103,7 +103,6 @@ public class UsernamePasswordLoginServlet extends HttpServlet {
             List<Pair<String, String>> queryParams = new ArrayList<Pair<String, String>>();
             queryParams.add(new Pair<String, String>(failureParam, "true"));
             redirectToLoginPage(request, response, queryParams);
-            return;
         }
     }
 
@@ -130,9 +129,10 @@ public class UsernamePasswordLoginServlet extends HttpServlet {
 
             if (queryParams == null) {
                 queryParams = new ArrayList<Pair<String, String>>();
-                queryParams.add(new Pair<String, String>("actionUrl", request.getContextPath()
-                        + request.getServletPath()));
             }
+            
+            queryParams.add(new Pair<String, String>("actionUrl", request.getContextPath()
+                    + request.getServletPath()));
             urlBuilder.getQueryParams().addAll(queryParams);
 
             log.debug("Redirecting to login page {}", urlBuilder.buildURL());