Commit 46a03cff authored by CADC Software Admin's avatar CADC Software Admin
Browse files

Merge branch 'ac2-aci' into release_candidate

parents af2d5d51 ece64846

projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -890,11 +890,11 @@ public class GMSClient implements TransferListener 
    public List<Group> getMemberships(Role role)

    public List<Group> getMemberships(Role role)

        throws UserNotFoundException, AccessControlException, IOException

        throws UserNotFoundException, AccessControlException, IOException

    {

    {

        return getMemberships(getCurrentUserID(), role);

        return getMemberships(null, role);

    }

    }





    

    

    private List<Group> getMemberships(Principal userID, Role role)

    private List<Group> getMemberships(Principal ignore, Role role)

        throws UserNotFoundException, AccessControlException, IOException

        throws UserNotFoundException, AccessControlException, IOException

    {

    {

        if (role == null)

        if (role == null)
@@ -902,6 +902,7 @@ public class GMSClient implements TransferListener 
            throw new IllegalArgumentException("role are required.");

            throw new IllegalArgumentException("role are required.");

        }

        }





        Principal userID = getCurrentUserID();

        if (userID != null)

        if (userID != null)

        {

        {

            List<Group> cachedGroups = getCachedGroups(userID, role, true);

            List<Group> cachedGroups = getCachedGroups(userID, role, true);