Commit b90a6b89 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 21719714 04f57abf

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

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import ca.nrc.cadc.ac.User; 
import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.auth.HttpPrincipal;



import javax.servlet.http.HttpServletResponse;

import java.io.IOException;

import java.io.InputStream;

import java.security.Principal;
@@ -107,6 +108,7 @@ public class ModifyUserAction extends UsersAction 
        }

        else

        {

            response.setStatus(HttpServletResponse.SC_OK);

            redirectGet(httpPrincipals.toArray(

                    new HttpPrincipal[1])[0].getName());

        }

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/UserRequestReader.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class UserRequestReader 
    {

        if (json == null)

        {

            throw new IllegalArgumentException("XML must not be null");

            throw new IllegalArgumentException("JSON must not be null");

        }

        else

        {