Commit b522169a authored by Brian Major's avatar Brian Major
Browse files

Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2

parents 1d4ae48f 469163fc

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class LoginServlet extends HttpServlet 
        try

        {

            log.info(logInfo.start());

            String userID = request.getParameter("userid");

            String userID = request.getParameter("username");

            String password = request.getParameter("password");

            if (StringUtil.hasText(userID))

            {